X-Git-Url: https://git.tcpdump.org/tcpdump/blobdiff_plain/5cdf53e257a7e947e1e72b590eea8c1471b9be6c..a63600a1fc28dbc7ae7ce9f996829c49a25fb33c:/af.c

diff --git a/af.c b/af.c
index bea6d977..ff95dfda 100644
--- a/af.c
+++ b/af.c
@@ -12,22 +12,21 @@
  * LIMITATION, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
  * FOR A PARTICULAR PURPOSE.
  *
- * Original code by Hannes Gredler (hannes@juniper.net)
+ * Original code by Hannes Gredler (hannes@gredler.at)
  */
 
-#define NETDISSECT_REWORKED
 #ifdef HAVE_CONFIG_H
-#include "config.h"
+#include <config.h>
 #endif
 
-#include <tcpdump-stdinc.h>
-#include "interface.h"
+#include "netdissect-stdinc.h"
+#include "netdissect.h"
 #include "af.h"
 
 const struct tok af_values[] = {
     { 0,                      "Reserved"},
-    { AFNUM_INET,             "IPv4"},
-    { AFNUM_INET6,            "IPv6"},
+    { AFNUM_IP,               "IPv4"},
+    { AFNUM_IP6,              "IPv6"},
     { AFNUM_NSAP,             "NSAP"},
     { AFNUM_HDLC,             "HDLC"},
     { AFNUM_BBN1822,          "BBN 1822"},
@@ -47,13 +46,13 @@ const struct tok af_values[] = {
 };
 
 const struct tok bsd_af_values[] = {
-    { BSD_AFNUM_INET, "IPv4" },
-    { BSD_AFNUM_NS, "NS" },
-    { BSD_AFNUM_ISO, "ISO" },
-    { BSD_AFNUM_APPLETALK, "Appletalk" },
-    { BSD_AFNUM_IPX, "IPX" },
-    { BSD_AFNUM_INET6_BSD, "IPv6" },
-    { BSD_AFNUM_INET6_FREEBSD, "IPv6" },
-    { BSD_AFNUM_INET6_DARWIN, "IPv6" },
+    { BSD_AF_INET, "IPv4" },
+    { BSD_AF_NS, "NS" },
+    { BSD_AF_ISO, "ISO" },
+    { BSD_AF_APPLETALK, "Appletalk" },
+    { BSD_AF_IPX, "IPX" },
+    { BSD_AF_INET6_BSD, "IPv6" },
+    { BSD_AF_INET6_FREEBSD, "IPv6" },
+    { BSD_AF_INET6_DARWIN, "IPv6" },
     { 0, NULL}
 };