X-Git-Url: https://git.tcpdump.org/tcpdump/blobdiff_plain/a6f81d534ddc1026442664d21a2122d64ab571a9..de0c7fc746c37eb83e15a6890d30dc6f608e9d76:/print-ipnet.c?ds=sidebyside diff --git a/print-ipnet.c b/print-ipnet.c index c4ff16ab..f71c1455 100644 --- a/print-ipnet.c +++ b/print-ipnet.c @@ -1,11 +1,12 @@ -#define NETDISSECT_REWORKED +/* \summary: Solaris DLT_IPNET printer */ + #ifdef HAVE_CONFIG_H #include "config.h" #endif -#include +#include -#include "interface.h" +#include "netdissect.h" typedef struct ipnet_hdr { uint8_t iph_version; @@ -55,7 +56,7 @@ ipnet_hdr_print(netdissect_options *ndo, const u_char *bp, u_int length) static void ipnet_print(netdissect_options *ndo, const u_char *p, u_int length, u_int caplen) { - ipnet_hdr_t *hdr; + const ipnet_hdr_t *hdr; if (caplen < sizeof(ipnet_hdr_t)) { ND_PRINT((ndo, "[|ipnet]")); @@ -67,7 +68,7 @@ ipnet_print(netdissect_options *ndo, const u_char *p, u_int length, u_int caplen length -= sizeof(ipnet_hdr_t); caplen -= sizeof(ipnet_hdr_t); - hdr = (ipnet_hdr_t *)p; + hdr = (const ipnet_hdr_t *)p; p += sizeof(ipnet_hdr_t); switch (hdr->iph_family) { @@ -82,7 +83,7 @@ ipnet_print(netdissect_options *ndo, const u_char *p, u_int length, u_int caplen default: if (!ndo->ndo_eflag) - ipnet_hdr_print(ndo, (u_char *)hdr, + ipnet_hdr_print(ndo, (const u_char *)hdr, length + sizeof(ipnet_hdr_t)); if (!ndo->ndo_suppress_default_print)