X-Git-Url: https://git.tcpdump.org/tcpdump/blobdiff_plain/09e85c97c83e87fd5cb0510b351b9d3fe328de78..c5a34f01b4d03a0c24f9abb57f0db45c502aceb5:/print-null.c diff --git a/print-null.c b/print-null.c index f1067ff5..f730a23f 100644 --- a/print-null.c +++ b/print-null.c @@ -33,7 +33,6 @@ #include "extract.h" #include "af.h" -static const char tstr[] = " [|null]"; /* * The DLT_NULL packet header is 4 bytes long. It contains a host-byte-order @@ -82,11 +81,12 @@ null_if_print(netdissect_options *ndo, const struct pcap_pkthdr *h, const u_char u_int caplen = h->caplen; uint32_t family; + ndo->ndo_protocol = "null_if"; if (caplen < NULL_HDRLEN) goto trunc; ND_TCHECK_4(p); - 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 @@ -140,13 +140,6 @@ null_if_print(netdissect_options *ndo, const struct pcap_pkthdr *h, const u_char return (NULL_HDRLEN); trunc: - ND_PRINT("%s", tstr); + nd_print_trunc(ndo); return (NULL_HDRLEN); } - -/* - * Local Variables: - * c-style: whitesmith - * c-basic-offset: 8 - * End: - */