X-Git-Url: https://git.tcpdump.org/tcpdump/blobdiff_plain/513f782ae18791f0c925b9235da749b38159b607..f34af1aa63da301ae7ee91e2300dff31702001f0:/print-ipnet.c diff --git a/print-ipnet.c b/print-ipnet.c index 97c83e3a..6a521ecc 100644 --- a/print-ipnet.c +++ b/print-ipnet.c @@ -1,7 +1,7 @@ /* \summary: Solaris DLT_IPNET printer */ #ifdef HAVE_CONFIG_H -#include "config.h" +#include #endif #include "netdissect-stdinc.h" @@ -9,7 +9,6 @@ #include "netdissect.h" #include "extract.h" -static const char tstr[] = "[|ipnet]"; typedef struct ipnet_hdr { nd_uint8_t iph_version; @@ -33,7 +32,7 @@ static const struct tok ipnet_values[] = { { 0, NULL } }; -static inline void +static void ipnet_hdr_print(netdissect_options *ndo, const u_char *bp, u_int length) { const ipnet_hdr_t *hdr; @@ -58,7 +57,7 @@ ipnet_hdr_print(netdissect_options *ndo, const u_char *bp, u_int length) ND_PRINT(", length %u: ", length); return; trunc: - ND_PRINT(" %s", tstr); + nd_print_trunc(ndo); } static void @@ -66,6 +65,7 @@ ipnet_print(netdissect_options *ndo, const u_char *p, u_int length, u_int caplen { const ipnet_hdr_t *hdr; + ndo->ndo_protocol = "ipnet"; if (caplen < sizeof(ipnet_hdr_t)) goto trunc; @@ -99,7 +99,7 @@ ipnet_print(netdissect_options *ndo, const u_char *p, u_int length, u_int caplen } return; trunc: - ND_PRINT(" %s", tstr); + nd_print_trunc(ndo); } /* @@ -112,16 +112,9 @@ u_int ipnet_if_print(netdissect_options *ndo, const struct pcap_pkthdr *h, const u_char *p) { + ndo->ndo_protocol = "ipnet_if"; ipnet_print(ndo, p, h->len, h->caplen); return (sizeof(ipnet_hdr_t)); } - -/* - * Local Variables: - * c-style: whitesmith - * c-basic-offset: 8 - * End: - */ - #endif /* DLT_IPNET */