diff options
| author | Guy Harris <guy@alum.mit.edu> | 2001-12-02 00:38:54 +0000 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2001-12-02 00:38:54 +0000 |
| commit | 2a21356d426b74d0320236c3688f1b33cd51a469 (patch) | |
| tree | f1e886c06e6b54144a9ce43f045a31be077742d7 /packet-x25.c | |
| parent | cfa1112e79c43d0d0d517f789d7e4ff3f0b236de (diff) | |
| download | wireshark-2a21356d426b74d0320236c3688f1b33cd51a469.tar.gz wireshark-2a21356d426b74d0320236c3688f1b33cd51a469.tar.bz2 wireshark-2a21356d426b74d0320236c3688f1b33cd51a469.zip | |
Add a new header file for X.264 transport protocol IDs.
Handle ISO 8602 as a protocol ID on top of X.25.
svn path=/trunk/; revision=4302
Diffstat (limited to 'packet-x25.c')
| -rw-r--r-- | packet-x25.c | 28 |
1 files changed, 17 insertions, 11 deletions
diff --git a/packet-x25.c b/packet-x25.c index 9cf3e1575a..9dbc744502 100644 --- a/packet-x25.c +++ b/packet-x25.c @@ -2,7 +2,7 @@ * Routines for x25 packet disassembly * Olivier Abad <oabad@cybercable.fr> * - * $Id: packet-x25.c,v 1.56 2001/12/02 00:07:46 guy Exp $ + * $Id: packet-x25.c,v 1.57 2001/12/02 00:38:53 guy Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> @@ -39,6 +39,7 @@ #include "packet.h" #include "prefs.h" #include "nlpid.h" +#include "x264_prt_id.h" #define FROM_DCE 0x80 @@ -191,7 +192,7 @@ typedef struct _vc_info { * secondary protocol identifier. */ #define PROTO_SNA -2 -#define PROTO_ISO_8073 -3 +#define PROTO_OSITP -3 /* * the hash table will contain linked lists of global_vc_info @@ -1477,14 +1478,12 @@ get_x25_pkt_len(tvbuff_t *tvb) return 0; } -#define PRT_ID_ISO_8073 0x01 - static const value_string prt_id_vals[] = { - {PRT_ID_ISO_8073, "ISO 8073 COTP"}, - {0x02, "ISO 8602"}, - {0x03, "ISO 10732 in conjunction with ISO 8073"}, - {0x04, "ISO 10736 in conjunction with ISO 8602"}, - {0x00, NULL} + {PRT_ID_ISO_8073, "ISO 8073 COTP"}, + {PRT_ID_ISO_8602, "ISO 8602 CLTP"}, + {PRT_ID_ISO_10736_ISO_8073, "ISO 10736 in conjunction with ISO 8073 COTP"}, + {PRT_ID_ISO_10736_ISO_8602, "ISO 10736 in conjunction with ISO 8602 CLTP"}, + {0x00, NULL} }; static const value_string sharing_strategy_vals[] = { @@ -1760,10 +1759,17 @@ dissect_x25(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) /* ISO 8073 COTP */ x25_hash_add_proto_start(vc, pinfo->fd->abs_secs, pinfo->fd->abs_usecs, - PROTO_ISO_8073); + PROTO_OSITP); /* XXX - disssect the rest of the user data as COTP? That needs support for NCM TPDUs, etc. */ break; + + case PRT_ID_ISO_8602: + /* ISO 8602 CLTP */ + x25_hash_add_proto_start(vc, pinfo->fd->abs_secs, + pinfo->fd->abs_usecs, + PROTO_OSITP); + break; } } else if (is_x_264 == 0) { /* It doesn't look like a UN TPDU, so compare the first @@ -2169,7 +2175,7 @@ dissect_x25(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) call_dissector(sna_handle, next_tvb, pinfo, tree); return; - case PROTO_ISO_8073: + case PROTO_OSITP: call_dissector(ositp_handle, next_tvb, pinfo, tree); return; |