diff options
| author | Guy Harris <guy@alum.mit.edu> | 2001-12-02 00:07:46 +0000 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2001-12-02 00:07:46 +0000 |
| commit | 8eba14815503f4243bd11c9cbe4d99557141d5cc (patch) | |
| tree | c01274dcce3fad1e1902f301470564147c3fb292 /nlpid.h | |
| parent | a7bb49b0d967c759dccab991e3ab049495a39dfc (diff) | |
An NLPID of 1 means T.70 when used as an X.263/ISO 9577 initial protocol
identifier, but means X.29 when used as an X.263/ISO 9577 secondary
protocol identifier.
Add support for the IPv6 NLPID, and Ethernet type, in more places.
Fix up the handling of the user data of a CALL REQUEST packet to more
correctly distinguish between user data containing an NLPID and user
data containing an X.264/ISO 11570 UN TPDU. If it's an NLPID, use
"nlpid_vals" to show its value.
Put that user data in a subtree.
Create a new "x.25.spi" dissector table, for protocols running atop
X.25, rather than having a built-in switch statement, so that other
protocols can register themselves by NLPID.
svn path=/trunk/; revision=4300
Diffstat (limited to 'nlpid.h')
| -rw-r--r-- | nlpid.h | 10 |
1 files changed, 5 insertions, 5 deletions
@@ -2,13 +2,12 @@ * Definitions of OSI NLPIDs (Network Layer Protocol IDs) * Laurent Deniel <deniel@worldnet.fr> * - * $Id: nlpid.h,v 1.9 2001/04/16 10:04:30 guy Exp $ + * $Id: nlpid.h,v 1.10 2001/12/02 00:07:46 guy Exp $ * * Ethereal - Network traffic analyzer - * By Gerald Combs <gerald@zing.org> + * 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 @@ -27,10 +26,11 @@ #ifndef __NLPID_H__ #define __NLPID_H__ -/* ISO/IEC TR 9577 NLPID values. */ +/* X.263 / ISO/IEC TR 9577 NLPID values. */ #define NLPID_NULL 0x00 -#define NLPID_T_70 0x01 /* T.70 */ +#define NLPID_IPI_T_70 0x01 /* T.70, when an IPI */ +#define NLPID_SPI_X_29 0x01 /* X.29, when an SPI */ #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 */ |