aboutsummaryrefslogtreecommitdiffstats
path: root/packet-ip.c
diff options
context:
space:
mode:
authorGuy Harris <guy@alum.mit.edu>2001-12-02 00:07:46 +0000
committerGuy Harris <guy@alum.mit.edu>2001-12-02 00:07:46 +0000
commit8eba14815503f4243bd11c9cbe4d99557141d5cc (patch)
treec01274dcce3fad1e1902f301470564147c3fb292 /packet-ip.c
parenta7bb49b0d967c759dccab991e3ab049495a39dfc (diff)
downloadwireshark-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-ip.c')
-rw-r--r--packet-ip.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/packet-ip.c b/packet-ip.c
index 97e517158b..cec90b0678 100644
--- a/packet-ip.c
+++ b/packet-ip.c
@@ -1,7 +1,7 @@
/* packet-ip.c
* Routines for IP and miscellaneous IP protocol packet disassembly
*
- * $Id: packet-ip.c,v 1.148 2001/11/26 04:52:50 hagbard Exp $
+ * $Id: packet-ip.c,v 1.149 2001/12/02 00:07:46 guy Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
@@ -1809,6 +1809,7 @@ proto_reg_handoff_ip(void)
dissector_add("null.type", BSD_AF_INET, dissect_ip, proto_ip);
dissector_add("chdlctype", ETHERTYPE_IP, dissect_ip, proto_ip);
dissector_add("fr.ietf", NLPID_IP, dissect_ip, proto_ip);
+ dissector_add("x.25.spi", NLPID_IP, dissect_ip, proto_ip);
}
void