AHCP: add version 1 decoder

[tcpdump] / print-ipnet.c

diff --git a/print-ipnet.c b/print-ipnet.c
index 32aaeae660ddee3a79769f1453ef5718b4ce83f2..e8ed94d52005b531adeedb540771524496bdcda0 100644 (file)
--- a/print-ipnet.c
+++ b/print-ipnet.c
@@ -14,7 +14,7 @@
 
 #ifdef DLT_IPNET
 
-const struct tok ipnet_values[] = {
+static const struct tok ipnet_values[] = {
        { IPH_AF_INET,          "IPv4" },
        { IPH_AF_INET6,         "IPv6" },
        { 0,                    NULL }
@@ -43,7 +43,7 @@ ipnet_hdr_print(struct netdissect_options *ndo, const u_char *bp, u_int length)
        ND_PRINT((ndo, ", length %u: ", length));
 }
 
-void
+static void
 ipnet_print(struct netdissect_options *ndo, const u_char *p, u_int length, u_int caplen)
 {
        ipnet_hdr_t *hdr;
@@ -69,7 +69,7 @@ ipnet_print(struct netdissect_options *ndo, const u_char *p, u_int length, u_int
 
 #ifdef INET6
        case IPH_AF_INET6:
-               ip6_print(p, length);
+               ip6_print(ndo, p, length);
                break;
 #endif /*INET6*/
 
@@ -91,7 +91,8 @@ 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, const struct pcap_pkthdr *h, const u_char *p)
+ipnet_if_print(struct netdissect_options *ndo,
+               const struct pcap_pkthdr *h, const u_char *p)
 {
        ipnet_print(ndo, p, h->len, h->caplen);