diff options
| -rw-r--r-- | Makefile.am | 3 | ||||
| -rw-r--r-- | packet-x25.c | 28 | ||||
| -rw-r--r-- | x264_prt_id.h | 35 |
3 files changed, 54 insertions, 12 deletions
diff --git a/Makefile.am b/Makefile.am index a24b6936d5..cde7ef0c3f 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,7 +1,7 @@ # Makefile.am # Automake file for Ethereal # -# $Id: Makefile.am,v 1.387 2001/11/28 07:11:06 guy Exp $ +# $Id: Makefile.am,v 1.388 2001/12/02 00:38:53 guy Exp $ # # Ethereal - Network traffic analyzer # By Gerald Combs <gerald@ethereal.com> @@ -471,6 +471,7 @@ ETHEREAL_COMMON_SRC = \ util.h \ x11-declarations.h \ x11-register-info.h \ + x264_prt_id.h \ xdlc.c \ xdlc.h \ xmlstub.c \ 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; diff --git a/x264_prt_id.h b/x264_prt_id.h new file mode 100644 index 0000000000..e44b3a8e2a --- /dev/null +++ b/x264_prt_id.h @@ -0,0 +1,35 @@ +/* x264_prt_id.h + * Definitions of X.264/ISO 11570 transport protocol IDs + * + * $Id: x264_prt_id.h,v 1.1 2001/12/02 00:38:54 guy Exp $ + * + * Ethereal - Network traffic analyzer + * By Gerald Combs <gerald@ethereal.com> + * Copyright 1998 Gerald Combs + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation; either version 2 + * of the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + */ + +#ifndef __X264_PRT_ID_H__ +#define __X264_PRT_ID_H__ + +/* X.264 / ISO 11570 transport protocol ID values. */ + +#define PRT_ID_ISO_8073 0x01 /* X.224/ISO 8073 COTP */ +#define PRT_ID_ISO_8602 0x02 /* X.234/ISO 8602 CLTP */ +#define PRT_ID_ISO_10736_ISO_8073 0x03 /* X.274/ISO 10736 + X.224/ISO 8073 */ +#define PRT_ID_ISO_10736_ISO_8602 0x04 /* X.274/ISO 10736 + X.234/ISO 8602 */ + +#endif |