From Michael Tuexen: AF_INET6 support for DLT_NULL captures from

Darwin/MacOS X.  (As if FreeBSD and {Net,Open}BSD having different
AF_INET6 values wasn't enough, we have The Other BSD having its own
value....)

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@5914 f5534014-38df-0310-8fa8-9805f1628bb7

diff --git a/aftypes.h b/aftypes.h
index 2ae1d92187866cbda06db65618032ec95a3a39dd..2f0d506d9e42e5dad4fc65770aa997a2db988b97 100644 (file)
--- a/aftypes.h
+++ b/aftypes.h
@@ -1,7 +1,7 @@
 /* aftypes.h
  * AF_ values on various flavors of BSD
  *
- * $Id: aftypes.h,v 1.1 2000/11/17 06:02:20 guy Exp $
+ * $Id: aftypes.h,v 1.2 2002/07/30 07:25:29 guy Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@zing.org>
@@ -31,3 +31,4 @@
 #define BSD_AF_IPX             23
 #define BSD_AF_INET6_BSD       24      /* OpenBSD (and probably NetBSD), BSD/OS */
 #define BSD_AF_INET6_FREEBSD   28
+#define BSD_AF_INET6_DARWIN    30

diff --git a/packet-ipv6.c b/packet-ipv6.c
index b87b5407a900209d11f49300d571483cb403b6a8..353a993c476acf85c9afa9a3ceb9c527c6b8f667 100644 (file)
--- a/packet-ipv6.c
+++ b/packet-ipv6.c
@@ -1,7 +1,7 @@
 /* packet-ipv6.c
  * Routines for IPv6 packet disassembly
  *
- * $Id: packet-ipv6.c,v 1.83 2002/06/07 10:11:39 guy Exp $
+ * $Id: packet-ipv6.c,v 1.84 2002/07/30 07:25:29 guy Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@ethereal.com>
@@ -1128,6 +1128,7 @@ proto_reg_handoff_ipv6(void)
   dissector_add("ip.proto", IP_PROTO_IPV6, ipv6_handle);
   dissector_add("null.type", BSD_AF_INET6_BSD, ipv6_handle);
   dissector_add("null.type", BSD_AF_INET6_FREEBSD, ipv6_handle);
+  dissector_add("null.type", BSD_AF_INET6_DARWIN, ipv6_handle);
   dissector_add("chdlctype", ETHERTYPE_IPv6, ipv6_handle);
   dissector_add("fr.ietf", NLPID_IP6, ipv6_handle);
   dissector_add("x.25.spi", NLPID_IP6, ipv6_handle);

diff --git a/packet-null.c b/packet-null.c
index 4b2997c1bacc821d391e60a63ef962e612c6f7c4..8d0974592a8fadcef367a320cc9fcf8d8d04d4d5 100644 (file)
--- a/packet-null.c
+++ b/packet-null.c
@@ -1,7 +1,7 @@
 /* packet-null.c
  * Routines for null packet disassembly
  *
- * $Id: packet-null.c,v 1.52 2002/01/21 07:36:38 guy Exp $
+ * $Id: packet-null.c,v 1.53 2002/07/30 07:25:29 guy Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@ethereal.com>
@@ -68,6 +68,7 @@ static const value_string family_vals[] = {
     {BSD_AF_IPX,           "Netware IPX/SPX"},
     {BSD_AF_INET6_BSD,     "IPv6"           },
     {BSD_AF_INET6_FREEBSD, "IPv6"           },
+    {BSD_AF_INET6_DARWIN,  "IPv6"           }, 
     {0,                    NULL             }
 };