diff options
| author | Guy Harris <guy@alum.mit.edu> | 2001-01-10 09:07:35 +0000 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2001-01-10 09:07:35 +0000 |
| commit | 039bd984c0791b345ef12806a24cb5c44cf0e2f7 (patch) | |
| tree | 8ada65a0f30fde1bc3c7eb46db802a42af046f93 /packet-ip.c | |
| parent | 2a8ac23dd2b55b88c264312fce9a65f895f71bdd (diff) | |
| download | wireshark-039bd984c0791b345ef12806a24cb5c44cf0e2f7.tar.gz wireshark-039bd984c0791b345ef12806a24cb5c44cf0e2f7.tar.bz2 wireshark-039bd984c0791b345ef12806a24cb5c44cf0e2f7.zip | |
Make the stuff to handle SNAP frames (OUI, PID, payload) a routine of
its own; it's used not only by LLC, but by Frame Relay with RFC 2427 and
ATM with RFC 2684.
Support for RFC 2427-encapsulation Frame Relay packets, from Paul
Ionescu.
Get rid of the CISCO_IP PPP protocol type - Cisco HDLC uses, in most
cases, Ethernet packet types, so use ETHERTYPE_IP instead (they're both
0x0800).
svn path=/trunk/; revision=2854
Diffstat (limited to 'packet-ip.c')
| -rw-r--r-- | packet-ip.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/packet-ip.c b/packet-ip.c index 3bfef03767..e3beb3c186 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.119 2001/01/09 06:31:36 guy Exp $ + * $Id: packet-ip.c,v 1.120 2001/01/10 09:07:35 guy Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@zing.org> @@ -53,6 +53,7 @@ #include "packet-ip.h" #include "packet-ipsec.h" #include "in_cksum.h" +#include "nlpid.h" static void dissect_icmp(tvbuff_t *, packet_info *, proto_tree *); static void dissect_igmp(tvbuff_t *, packet_info *, proto_tree *); @@ -1481,11 +1482,14 @@ proto_reg_handoff_ip(void) { dissector_add("ethertype", ETHERTYPE_IP, dissect_ip, proto_ip); dissector_add("ppp.protocol", PPP_IP, dissect_ip, proto_ip); - dissector_add("ppp.protocol", CISCO_IP, dissect_ip, proto_ip); + dissector_add("ppp.protocol", ETHERTYPE_IP, dissect_ip, proto_ip); dissector_add("llc.dsap", SAP_IP, dissect_ip, proto_ip); dissector_add("ip.proto", IP_PROTO_IPV4, dissect_ip, proto_ip); dissector_add("ip.proto", IP_PROTO_IPIP, dissect_ip, proto_ip); dissector_add("null.type", BSD_AF_INET, dissect_ip, proto_ip); + dissector_add("fr.cisco", ETHERTYPE_IP, dissect_ip, proto_ip); + dissector_add("fr.ietf", NLPID_IP, dissect_ip, proto_ip); + } void |