From: Guy Harris <guy@alum.mit.edu>
Date: Mon, 7 Mar 2011 17:15:40 +0000 (-0800)
Subject: LINKTYPE_ARCNET doesn't have standard ARCNET headers, it has headers as
X-Git-Tag: libpcap-1.2.1~82
X-Git-Url: https://git.tcpdump.org/libpcap/commitdiff_plain/f69d068f2c52756a148fbb9bd4a0a213f45eb0f0

LINKTYPE_ARCNET doesn't have standard ARCNET headers, it has headers as
munged by BSD, with the Information Length field and the second byte of
the Destination Identifier field dropped; call it LINKTYPE_ARCNET_BSD.
(Don't change the DLT_ name, for backwards compatibility.)
---

diff --git a/pcap-common.c b/pcap-common.c
index 97488f12..8aa6c4ab 100644
--- a/pcap-common.c
+++ b/pcap-common.c
@@ -114,7 +114,7 @@ static const char rcsid[] _U_ =
 #define LINKTYPE_PRONET		DLT_PRONET
 #define LINKTYPE_CHAOS		DLT_CHAOS
 #define LINKTYPE_TOKEN_RING	DLT_IEEE802	/* DLT_IEEE802 is used for Token Ring */
-#define LINKTYPE_ARCNET		DLT_ARCNET	/* BSD-style headers */
+#define LINKTYPE_ARCNET_BSD	DLT_ARCNET	/* BSD-style headers */
 #define LINKTYPE_SLIP		DLT_SLIP
 #define LINKTYPE_PPP		DLT_PPP
 #define LINKTYPE_FDDI		DLT_FDDI
@@ -788,7 +788,7 @@ static struct linktype_map {
 	{ DLT_PRONET,		LINKTYPE_PRONET },
 	{ DLT_CHAOS,		LINKTYPE_CHAOS },
 	{ DLT_IEEE802,		LINKTYPE_TOKEN_RING },
-	{ DLT_ARCNET,		LINKTYPE_ARCNET },
+	{ DLT_ARCNET,		LINKTYPE_ARCNET_BSD },
 	{ DLT_SLIP,		LINKTYPE_SLIP },
 	{ DLT_PPP,		LINKTYPE_PPP },
 	{ DLT_FDDI,	 	LINKTYPE_FDDI },