X-Git-Url: https://git.tcpdump.org/tcpdump/blobdiff_plain/fb2479d733dbe8a991d11909b319341f7db62ab1..b5068d5380c73e02bc35a96f641cad18d9b03f3d:/print-null.c?ds=inline

diff --git a/print-null.c b/print-null.c
index b859c831..f2ea96e2 100644
--- a/print-null.c
+++ b/print-null.c
@@ -30,8 +30,10 @@
 #include <string.h>
 
 #include "netdissect.h"
+#include "extract.h"
 #include "af.h"
 
+
 /*
  * The DLT_NULL packet header is 4 bytes long. It contains a host-byte-order
  * 32-bit integer that specifies the family, e.g. AF_INET.
@@ -52,8 +54,8 @@
 #define	SWAPLONG(y) \
 ((((y)&0xff)<<24) | (((y)&0xff00)<<8) | (((y)&0xff0000)>>8) | (((y)>>24)&0xff))
 
-static inline void
-null_hdr_print(netdissect_options *ndo, u_int family, u_int length)
+static void
+null_hdr_print(netdissect_options *ndo, uint32_t family, u_int length)
 {
 	if (!ndo->ndo_qflag) {
 		ND_PRINT("AF %s (%u)",
@@ -72,19 +74,22 @@ null_hdr_print(netdissect_options *ndo, u_int family, u_int length)
  * 'h->len' is the length of the packet off the wire, and 'h->caplen'
  * is the number of bytes actually captured.
  */
-u_int
+void
 null_if_print(netdissect_options *ndo, const struct pcap_pkthdr *h, const u_char *p)
 {
 	u_int length = h->len;
 	u_int caplen = h->caplen;
-	u_int family;
+	uint32_t family;
 
+	ndo->ndo_protocol = "null";
 	if (caplen < NULL_HDRLEN) {
-		ND_PRINT("[|null]");
-		return (NULL_HDRLEN);
+		ndo->ndo_ll_header_length += caplen;
+		nd_print_trunc(ndo);
+		return;
 	}
+	ndo->ndo_ll_header_length += NULL_HDRLEN;
 
-	memcpy((char *)&family, (const char *)p, sizeof(family));
+	family = GET_HE_U_4(p);
 
 	/*
 	 * This isn't necessarily in our host byte order; if this is
@@ -136,12 +141,5 @@ null_if_print(netdissect_options *ndo, const struct pcap_pkthdr *h, const u_char
 			ND_DEFAULTPRINT(p, caplen);
 	}
 
-	return (NULL_HDRLEN);
+	return;
 }
-
-/*
- * Local Variables:
- * c-style: whitesmith
- * c-basic-offset: 8
- * End:
- */