diff options
| author | Guy Harris <guy@alum.mit.edu> | 2003-01-23 04:04:01 +0000 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2003-01-23 04:04:01 +0000 |
| commit | 8e6518ea607984b4fb76d0e04c28fed8631b368c (patch) | |
| tree | f214615d7ccc4c35e113ba59059839b4f3a043dd /packet-ip.c | |
| parent | 46ce1e6079557ec10c18d4d8908edaad7bc9354f (diff) | |
In the BSDs, ARCNET packets don't have an offset field between the
addresses and the protocol type, as supplied by BPF; on Linux, they *do*
have an offset field, as supplied by PF_PACKET sockets. Add a new
WTAP_ENCAP_ARCNET_LINUX, with packets that include the offset field, and
don't dissect an offset in WTAP_ENCAP_ARCNET packets.
Map a libpcap link-layer type of 129 to WTAP_ENCAP_ARCNET_LINUX; that
value was recently assigned to Linux-style ARCNET.
Add some more ARCNET protocol IDs.
For most protocol IDs, dissect an ATA 878.2 fragmentation header; don't
do it for RFC 1051 IP and ARP, and Diagnose packets. Set the length of
the ARCNET protocol tree item appropriately.
Dissect both the RFC 1051 and RFC 1201 styles of IP and ARP over ARCNET,
and dissect the RFC 1201 style of RARP as well.
svn path=/trunk/; revision=6981
Diffstat (limited to 'packet-ip.c')
| -rw-r--r-- | packet-ip.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/packet-ip.c b/packet-ip.c index 1dea05bea5..c9bcc03b67 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.181 2003/01/22 01:16:33 sahlberg Exp $ + * $Id: packet-ip.c,v 1.182 2003/01/23 04:03:58 guy Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> @@ -1755,7 +1755,8 @@ proto_reg_handoff_ip(void) dissector_add("chdlctype", ETHERTYPE_IP, ip_handle); dissector_add("fr.ietf", NLPID_IP, ip_handle); dissector_add("x.25.spi", NLPID_IP, ip_handle); - dissector_add("arcnet.protocol_id", ARCNET_PROTO_IP, ip_handle); + dissector_add("arcnet.protocol_id", ARCNET_PROTO_IP_1051, ip_handle); + dissector_add("arcnet.protocol_id", ARCNET_PROTO_IP_1201, ip_handle); } void |