From ad0c9114e00a9a30168e0c13c17d8f65571aa67f Mon Sep 17 00:00:00 2001
From: glebius <glebius@FreeBSD.org>
Date: Fri, 10 Feb 2017 07:22:12 +0000
Subject: Merge r309649, r313048, r313083, r313104:

  tcpdump 4.9.0
---
 contrib/tcpdump/print-nflog.c | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

(limited to 'contrib/tcpdump/print-nflog.c')

diff --git a/contrib/tcpdump/print-nflog.c b/contrib/tcpdump/print-nflog.c
index 95da4cb..41cbf78 100644
--- a/contrib/tcpdump/print-nflog.c
+++ b/contrib/tcpdump/print-nflog.c
@@ -25,23 +25,24 @@
  * DAMAGE.
  */
 
-#define NETDISSECT_REWORKED
+/* \summary: DLT_NFLOG printer */
+
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
 
-#include <tcpdump-stdinc.h>
+#include <netdissect-stdinc.h>
 
-#include "interface.h"
+#include "netdissect.h"
 
 #if defined(DLT_NFLOG) && defined(HAVE_PCAP_NFLOG_H)
 #include <pcap/nflog.h>
 
 static const struct tok nflog_values[] = {
 	{ AF_INET,		"IPv4" },
-#ifdef INET6
+#ifdef AF_INET6
 	{ AF_INET6,		"IPv6" },
-#endif /*INET6*/
+#endif /*AF_INET6*/
 	{ 0,			NULL }
 };
 
@@ -81,7 +82,7 @@ nflog_if_print(netdissect_options *ndo,
 		return h_size;
 	}
 
-	if (!(hdr->nflog_version) == 0) {
+	if (hdr->nflog_version != 0) {
 		ND_PRINT((ndo, "version %u (unknown)", hdr->nflog_version));
 		return h_size;
 	}
-- 
cgit v1.1