X-Git-Url: https://git.tcpdump.org/tcpdump/blobdiff_plain/96c60029b3f935eff892d1f49b52f305423e4671..a63600a1fc28dbc7ae7ce9f996829c49a25fb33c:/print-nflog.c?ds=sidebyside

diff --git a/print-nflog.c b/print-nflog.c
index cc58e022..bbe4ccfc 100644
--- a/print-nflog.c
+++ b/print-nflog.c
@@ -103,11 +103,19 @@ typedef struct nflog_timestamp {
 #define NFULA_HWHEADER			16	/* skbuff's MAC-layer header */
 #define NFULA_HWLEN			17	/* length of skbuff's MAC-layer header */
 
+/*
+ * Define two constants specifically for the two AF code points from the
+ * LINKTYPE_NFLOG specification above and use these constants instead of
+ * AF_INET and AF_INET6.  This is the only way to dissect the "wire" encoding
+ * correctly because some BSD systems define AF_INET6 differently from Linux
+ * (see af.h) and Haiku defines both AF_INET and AF_INET6 differently from
+ * Linux.
+ */
+#define NFLOG_AF_INET   2
+#define NFLOG_AF_INET6 10
 static const struct tok nflog_values[] = {
-	{ AF_INET,		"IPv4" },
-#ifdef AF_INET6
-	{ AF_INET6,		"IPv6" },
-#endif /*AF_INET6*/
+	{ NFLOG_AF_INET,	"IPv4" },
+	{ NFLOG_AF_INET6,	"IPv6" },
 	{ 0,			NULL }
 };
 
@@ -205,15 +213,13 @@ nflog_if_print(netdissect_options *ndo,
 
 	switch (GET_U_1(hdr->nflog_family)) {
 
-	case AF_INET:
+	case NFLOG_AF_INET:
 		ip_print(ndo, p, length);
 		break;
 
-#ifdef AF_INET6
-	case AF_INET6:
+	case NFLOG_AF_INET6:
 		ip6_print(ndo, p, length);
 		break;
-#endif /* AF_INET6 */
 
 	default:
 		if (!ndo->ndo_eflag)
@@ -230,7 +236,6 @@ nflog_if_print(netdissect_options *ndo,
 trunc:
 	nd_print_trunc(ndo);
 	ndo->ndo_ll_hdr_len += h_size - NFLOG_HDR_LEN;
-	return;
 }
 
 #endif /* DLT_NFLOG */