diff options
| -rw-r--r-- | nlpid.h | 34 | ||||
| -rw-r--r-- | packet-fr.c | 4 | ||||
| -rw-r--r-- | packet-wcp.c | 3 |
3 files changed, 20 insertions, 21 deletions
@@ -2,7 +2,7 @@ * Definitions of OSI NLPIDs (Network Layer Protocol IDs) * Laurent Deniel <deniel@worldnet.fr> * - * $Id: nlpid.h,v 1.5 2000/08/11 13:34:19 deniel Exp $ + * $Id: nlpid.h,v 1.6 2001/03/23 21:49:23 guy Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@zing.org> @@ -29,22 +29,24 @@ /* ISO/IEC TR 9577 NLPID values. */ -#define NLPID_NULL 0x00 +#define NLPID_NULL 0x00 #define NLPID_T_70 0x01 /* T.70 */ -#define NLPID_X_633 0x03 /* X.633 */ -#define NLPID_Q_931 0x08 /* Q.931, Q.932, Q.933, X.36, ISO 11572, ISO 11582 */ -#define NLPID_Q_2931 0x09 /* Q.2931 */ -#define NLPID_Q_2119 0x0c /* Q.2119 */ -#define NLPID_SNAP 0x80 -#define NLPID_ISO8473_CLNP 0x81 /* X.233 */ -#define NLPID_ISO9542_ESIS 0x82 -#define NLPID_ISO10589_ISIS 0x83 -#define NLPID_ISO10747_IDRP 0x85 -#define NLPID_ISO9542X25_ESIS 0x8a -#define NLPID_ISO10030 0x8c -#define NLPID_ISO11577 0x8d /* X.273 */ -#define NLPID_IP 0xcc -#define NLPID_PPP 0xcf +#define NLPID_X_633 0x03 /* X.633 */ +#define NLPID_Q_931 0x08 /* Q.931, Q.932, Q.933, X.36, ISO 11572, ISO 11582 */ +#define NLPID_Q_2931 0x09 /* Q.2931 */ +#define NLPID_Q_2119 0x0c /* Q.2119 */ +#define NLPID_SNAP 0x80 +#define NLPID_ISO8473_CLNP 0x81 /* X.233 */ +#define NLPID_ISO9542_ESIS 0x82 +#define NLPID_ISO10589_ISIS 0x83 +#define NLPID_ISO10747_IDRP 0x85 +#define NLPID_ISO9542X25_ESIS 0x8a +#define NLPID_ISO10030 0x8c +#define NLPID_ISO11577 0x8d /* X.273 */ +#define NLPID_IP 0xcc +#define NLPID_PPP 0xcf + +#define NLPID_WCP 0xb0 /* Wellfleet compression IP */ extern const value_string nlpid_vals[]; diff --git a/packet-fr.c b/packet-fr.c index 9fde78281e..6b50d4a378 100644 --- a/packet-fr.c +++ b/packet-fr.c @@ -3,7 +3,7 @@ * * Copyright 2001, Paul Ionescu <paul@acorp.ro> * - * $Id: packet-fr.c,v 1.10 2001/03/23 19:22:02 jfoster Exp $ + * $Id: packet-fr.c,v 1.11 2001/03/23 21:49:23 guy Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@zing.org> @@ -68,8 +68,6 @@ #define FROM_DCE 0x80 /* for direction setting */ -#define NLPID_WCP 0xb0 /* Wellfleet compression ip */ - static gint proto_fr = -1; static gint ett_fr = -1; static gint hf_fr_dlci = -1; diff --git a/packet-wcp.c b/packet-wcp.c index 2937e8d605..08e0335130 100644 --- a/packet-wcp.c +++ b/packet-wcp.c @@ -2,7 +2,7 @@ * Routines for Wellfleet Compression frame disassembly * Copyright 2001, Jeffrey C. Foster <jfoste@woodward.com> * - * $Id: packet-wcp.c,v 1.2 2001/03/23 20:47:17 jfoster Exp $ + * $Id: packet-wcp.c,v 1.3 2001/03/23 21:49:23 guy Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@zing.org> @@ -184,7 +184,6 @@ static int hf_wcp_type = -1; static gint ett_wcp = -1; static gint ett_wcp_field = -1; -#define NLPID_WCP 0xb0 /* NLPID value for WCP */ #define ETHERTYPE_WCP 0x80ff /* ether snap value for WCP */ /* |