aboutsummaryrefslogtreecommitdiffstats
path: root/packet-ip.c
diff options
context:
space:
mode:
authorGuy Harris <guy@alum.mit.edu>2000-12-14 08:20:31 +0000
committerGuy Harris <guy@alum.mit.edu>2000-12-14 08:20:31 +0000
commit13ca5c39d754c287dc5f9adee86aca9fdc820ec6 (patch)
tree363c9c33cda7869684bc7b282c80617ff4171021 /packet-ip.c
parent33474c33cc86f40655b4b2a51d0b7e131e6cda2b (diff)
downloadwireshark-13ca5c39d754c287dc5f9adee86aca9fdc820ec6.tar.gz
wireshark-13ca5c39d754c287dc5f9adee86aca9fdc820ec6.tar.bz2
wireshark-13ca5c39d754c287dc5f9adee86aca9fdc820ec6.zip
PPP patches from Burke Lau to:
add FCS checking; support Cisco HDLC format in the PPP dissector; handle MPLS-over-PPP. svn path=/trunk/; revision=2754
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 85f7d3b47a..be80d6ae6f 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.112 2000/12/13 16:38:20 ashokn Exp $
+ * $Id: packet-ip.c,v 1.113 2000/12/14 08:20:29 guy Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@zing.org>
@@ -1471,6 +1471,7 @@ proto_reg_handoff_ip(void)
{
dissector_add("ethertype", ETHERTYPE_IP, dissect_ip);
dissector_add("ppp.protocol", PPP_IP, dissect_ip);
+ dissector_add("ppp.protocol", CISCO_IP, dissect_ip);
dissector_add("llc.dsap", SAP_IP, dissect_ip);
dissector_add("ip.proto", IP_PROTO_IPV4, dissect_ip);
dissector_add("ip.proto", IP_PROTO_IPIP, dissect_ip);