Fix mkdep invocations.

[tcpdump] / print-ipnet.c

diff --git a/print-ipnet.c b/print-ipnet.c
index 3e710948656717e589d77d26910ea363cb572c65..f71c145550b0463dd5df2cea7e7551219417298a 100644 (file)
--- a/print-ipnet.c
+++ b/print-ipnet.c
@@ -1,14 +1,12 @@
+/* \summary: Solaris DLT_IPNET printer */
+
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
 
-#include <tcpdump-stdinc.h>
-
-#include <stdio.h>
-#include <pcap.h>
+#include <netdissect-stdinc.h>
 
 #include "netdissect.h"
-#include "interface.h"
 
 typedef struct ipnet_hdr {
        uint8_t         iph_version;
@@ -33,7 +31,7 @@ static const struct tok ipnet_values[] = {
 };
 
 static inline void
-ipnet_hdr_print(struct netdissect_options *ndo, const u_char *bp, u_int length)
+ipnet_hdr_print(netdissect_options *ndo, const u_char *bp, u_int length)
 {
        const ipnet_hdr_t *hdr;
        hdr = (const ipnet_hdr_t *)bp;
@@ -56,9 +54,9 @@ ipnet_hdr_print(struct netdissect_options *ndo, const u_char *bp, u_int length)
 }
 
 static void
-ipnet_print(struct netdissect_options *ndo, const u_char *p, u_int length, u_int caplen)
+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]"));
@@ -70,7 +68,7 @@ ipnet_print(struct netdissect_options *ndo, const u_char *p, u_int length, u_int
 
        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) {
@@ -79,19 +77,17 @@ ipnet_print(struct netdissect_options *ndo, const u_char *p, u_int length, u_int
                ip_print(ndo, p, length);
                break;
 
-#ifdef INET6
        case IPH_AF_INET6:
                ip6_print(ndo, p, length);
                break;
-#endif /*INET6*/
 
        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)
-                       ndo->ndo_default_print(ndo, p, caplen);
+                       ND_DEFAULTPRINT(p, caplen);
                break;
        }
 }
@@ -103,7 +99,7 @@ ipnet_print(struct netdissect_options *ndo, const u_char *p, u_int length, u_int
  * is the number of bytes actually captured.
  */
 u_int
-ipnet_if_print(struct netdissect_options *ndo,
+ipnet_if_print(netdissect_options *ndo,
                const struct pcap_pkthdr *h, const u_char *p)
 {
        ipnet_print(ndo, p, h->len, h->caplen);