diff options
| author | Martin Mathieson <martin.r.mathieson@googlemail.com> | 2006-09-05 16:05:23 +0000 |
|---|---|---|
| committer | Martin Mathieson <martin.r.mathieson@googlemail.com> | 2006-09-05 16:05:23 +0000 |
| commit | 2e1177c328b5f82d098e76eaf0ee3ed10ff2be53 (patch) | |
| tree | ef49cde2000f57e115adc2ce7fbb1df4491d12e7 /wiretap | |
| parent | 56e1dd7780baa742a8827e917a389568c4a6edf8 (diff) | |
| download | wireshark-2e1177c328b5f82d098e76eaf0ee3ed10ff2be53.tar.gz wireshark-2e1177c328b5f82d098e76eaf0ee3ed10ff2be53.tar.bz2 wireshark-2e1177c328b5f82d098e76eaf0ee3ed10ff2be53.zip | |
For DCT2000, show better transport info:
- for FP over AAL2, add CID to AAL tree
- for IPPRIM protocols, show IPV4 addresses in src & dst columns
svn path=/trunk/; revision=19156
Diffstat (limited to 'wiretap')
| -rw-r--r-- | wiretap/catapult_dct2000.c | 6 | ||||
| -rw-r--r-- | wiretap/wtap.h | 1 |
2 files changed, 7 insertions, 0 deletions
diff --git a/wiretap/catapult_dct2000.c b/wiretap/catapult_dct2000.c index 3753b9acec..da5b126958 100644 --- a/wiretap/catapult_dct2000.c +++ b/wiretap/catapult_dct2000.c @@ -1226,6 +1226,12 @@ void set_aal_info(union wtap_pseudo_header *pseudo_header, packet_direction_t di /* 0 means we don't know how many cells the frame comprises. */ pseudo_header->dct2000.inner_pseudo_header.atm.cells = 0; + + /* cid is last byte */ + pseudo_header->dct2000.inner_pseudo_header.atm.aal2_cid = + ((hex_from_char(aal_header_chars[10]) << 4) | + hex_from_char(aal_header_chars[11])); + } diff --git a/wiretap/wtap.h b/wiretap/wtap.h index 6f63a76d18..750d0d647d 100644 --- a/wiretap/wtap.h +++ b/wiretap/wtap.h @@ -364,6 +364,7 @@ struct atm_phdr { guint8 subtype; /* traffic subtype */ guint16 vpi; /* virtual path identifier */ guint16 vci; /* virtual circuit identifier */ + guint8 aal2_cid; /* channel id */ guint16 channel; /* link: 0 for DTE->DCE, 1 for DCE->DTE */ guint16 cells; /* number of cells */ guint16 aal5t_u2u; /* user-to-user indicator */ |