Fixed some warnings, added print-zep.c to CMakeLists

[tcpdump] / print-ipnet.c

diff --git a/print-ipnet.c b/print-ipnet.c
index d013caf12c1f5f7b8269ab2694cebc80aff9eb09..6a521eccca19799d148d46ceb404417dfa075021 100644 (file)
--- a/print-ipnet.c
+++ b/print-ipnet.c
@@ -1,15 +1,14 @@
 /* \summary: Solaris DLT_IPNET printer */
 
 #ifdef HAVE_CONFIG_H
-#include "config.h"
+#include <config.h>
 #endif
 
-#include <netdissect-stdinc.h>
+#include "netdissect-stdinc.h"
 
 #include "netdissect.h"
 #include "extract.h"
 
-static const char tstr[] = "[|ipnet]";
 
 typedef struct ipnet_hdr {
        nd_uint8_t      iph_version;
@@ -33,18 +32,18 @@ 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;
        hdr = (const ipnet_hdr_t *)bp;
 
        ND_TCHECK_SIZE(hdr);
-       ND_PRINT("%d > %d", EXTRACT_BE_U_4(hdr->iph_zsrc),
+       ND_PRINT("%u > %u", EXTRACT_BE_U_4(hdr->iph_zsrc),
                  EXTRACT_BE_U_4(hdr->iph_zdst));
 
        if (!ndo->ndo_qflag) {
-               ND_PRINT(", family %s (%d)",
+               ND_PRINT(", family %s (%u)",
                           tok2str(ipnet_values, "Unknown",
                                   EXTRACT_U_1(hdr->iph_family)),
                           EXTRACT_U_1(hdr->iph_family));
@@ -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 */