aboutsummaryrefslogtreecommitdiff
path: root/ethertype.h
diff options
context:
space:
mode:
authorguy <guy>2001-01-14 21:26:52 +0000
committerguy <guy>2001-01-14 21:26:52 +0000
commit79762d33da05e13d7ff3f3f6996f58cef2f17f43 (patch)
treefca5409bb73d62a12c7d3080d44eb430fbcde813 /ethertype.h
parentd4869582d0bc61efe9f33cef26935580e20fc7cf (diff)
I've seen captures with all four different flavors of IPX frames on
Ethernet, so, at least on Ethernet, when checking for IPX frames, check for all of them, including Ethernet_II and Ethernet_SNAP. Add an "llc.h" file with LLC SAP values, taken from tcpdump's "llc.h" file, and use those, rather than defining them ourselves in "gencode.c".
Diffstat (limited to 'ethertype.h')
-rw-r--r--ethertype.h11
1 files changed, 7 insertions, 4 deletions
diff --git a/ethertype.h b/ethertype.h
index 3af6f86c..3e75a964 100644
--- a/ethertype.h
+++ b/ethertype.h
@@ -18,7 +18,7 @@
* WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF
* MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
*
- * @(#) $Header: /tcpdump/master/libpcap/ethertype.h,v 1.11 2000-10-22 04:15:55 guy Exp $ (LBL)
+ * @(#) $Header: /tcpdump/master/libpcap/ethertype.h,v 1.12 2001-01-14 21:26:52 guy Exp $ (LBL)
*/
/*
@@ -93,12 +93,15 @@
#ifndef ETHERTYPE_AARP
#define ETHERTYPE_AARP 0x80f3
#endif
-#ifndef ETHERTYPE_IPV6
-#define ETHERTYPE_IPV6 0x86dd
-#endif
#ifndef ETHERTYPE_8021Q
#define ETHERTYPE_8021Q 0x8100
#endif
+#ifndef ETHERTYPE_IPX
+#define ETHERTYPE_IPX 0x8137
+#endif
+#ifndef ETHERTYPE_IPV6
+#define ETHERTYPE_IPV6 0x86dd
+#endif
#ifndef ETHERTYPE_LOOPBACK
#define ETHERTYPE_LOOPBACK 0x9000
#endif