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-fr.c | |
| 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 'packet-fr.c')
| -rw-r--r-- | packet-fr.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/packet-fr.c b/packet-fr.c index 17b937d0ae..f23af06862 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.23 2001/11/30 04:39:45 guy Exp $ + * $Id: packet-fr.c,v 1.24 2001/12/02 00:07:46 guy Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> @@ -105,11 +105,12 @@ static const true_false_string ea_string = { /* * This isn't the same as "nlpid_vals[]"; 0x08 is Q.933, not Q.931, - * and 0x09 is LMI, not Q.2931. + * and 0x09 is LMI, not Q.2931, and we assume that it's an initial + * protocol identifier, so 0x01 is T.70, not X.29. */ static const value_string fr_nlpid_vals[] = { { NLPID_NULL, "NULL" }, - { NLPID_T_70, "T.70" }, + { NLPID_IPI_T_70, "T.70" }, /* XXX - IPI, or SPI? */ { NLPID_X_633, "X.633" }, { NLPID_Q_931, "Q.933" }, { NLPID_LMI, "LMI" }, @@ -124,6 +125,7 @@ static const value_string fr_nlpid_vals[] = { { NLPID_ISO11577, "ISO 11577" }, { NLPID_COMPRESSED, "Data compression protocol" }, { NLPID_IP, "IP" }, + { NLPID_IP6, "IPv6" }, { NLPID_PPP, "PPP" }, { 0, NULL }, }; |