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 /packet-osi.c | |
| parent | a7bb49b0d967c759dccab991e3ab049495a39dfc (diff) | |
| download | wireshark-8eba14815503f4243bd11c9cbe4d99557141d5cc.tar.gz wireshark-8eba14815503f4243bd11c9cbe4d99557141d5cc.tar.bz2 wireshark-8eba14815503f4243bd11c9cbe4d99557141d5cc.zip | |
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 'packet-osi.c')
| -rw-r--r-- | packet-osi.c | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/packet-osi.c b/packet-osi.c index cf00d31f18..bd6cc15eaf 100644 --- a/packet-osi.c +++ b/packet-osi.c @@ -2,7 +2,7 @@ * Routines for ISO/OSI network and transport protocol packet disassembly * Main entrance point and common functions * - * $Id: packet-osi.c,v 1.48 2001/11/29 23:07:49 guy Exp $ + * $Id: packet-osi.c,v 1.49 2001/12/02 00:07:46 guy Exp $ * Laurent Deniel <deniel@worldnet.fr> * Ralf Schneider <Ralf.Schneider@t-online.de> * @@ -103,9 +103,17 @@ calc_checksum( tvbuff_t *tvb, int offset, u_int len, u_int checksum) { /* main entry point */ +/* + * These assume the NLPID is a secondary protocol identifier, not an + * initial protocol identifier. + * + * This is an issue only if, in any packet where an NLPID appears, it's + * an initial protocol identifier *AND* it can have the value 1, which + * means T.70 for an IPI and X.29 for an SPI. + */ const value_string nlpid_vals[] = { { NLPID_NULL, "NULL" }, - { NLPID_T_70, "T.70" }, + { NLPID_SPI_X_29, "X.29" }, { NLPID_X_633, "X.633" }, { NLPID_Q_931, "Q.931" }, { NLPID_Q_2931, "Q.2931" }, |