That didn't work, either.

[tcpdump] / print-pim.c

diff --git a/print-pim.c b/print-pim.c
index 5dc311f1dfb4e125596a0daafb1024afc5590259..49c9f4659358a2dfc5d2136b917ef91ea02faf64 100644 (file)
--- a/print-pim.c
+++ b/print-pim.c
@@ -22,10 +22,10 @@
 /* \summary: Protocol Independent Multicast (PIM) printer */
 
 #ifdef HAVE_CONFIG_H
-#include "config.h"
+#include <config.h>
 #endif
 
-#include <netdissect-stdinc.h>
+#include "netdissect-stdinc.h"
 
 #include "netdissect.h"
 #include "addrtoname.h"
@@ -169,9 +169,9 @@ pimv1_join_prune_print(netdissect_options *ndo,
                return;
        }
 
-       if (len < sizeof(struct in_addr))
+       if (len < sizeof(nd_ipv4))
                goto trunc;
-       ND_TCHECK_LEN(bp, sizeof(struct in_addr));
+       ND_TCHECK_LEN(bp, sizeof(nd_ipv4));
        if (ndo->ndo_vflag > 1)
                ND_PRINT("\n");
        ND_PRINT(" Upstream Nbr: %s", ipaddr_string(ndo, bp));
@@ -202,13 +202,13 @@ pimv1_join_prune_print(netdissect_options *ndo,
                 */
                if (len < 4)
                        goto trunc;
-               ND_TCHECK_LEN(bp, sizeof(struct in_addr));
+               ND_TCHECK_LEN(bp, sizeof(nd_ipv4));
                ND_PRINT("\n\tGroup: %s", ipaddr_string(ndo, bp));
                bp += 4;
                len -= 4;
                if (len < 4)
                        goto trunc;
-               ND_TCHECK_LEN(bp, sizeof(struct in_addr));
+               ND_TCHECK_LEN(bp, sizeof(nd_ipv4));
                if (EXTRACT_BE_U_4(bp) != 0xffffffff)
                        ND_PRINT("/%s", ipaddr_string(ndo, bp));
                bp += 4;
@@ -290,7 +290,7 @@ pimv1_print(netdissect_options *ndo,
                          ipaddr_string(ndo, bp + 24));
                break;
        case PIMV1_TYPE_REGISTER_STOP:
-               ND_TCHECK_LEN(bp + 12, sizeof(struct in_addr));
+               ND_TCHECK_LEN(bp + 12, sizeof(nd_ipv4));
                ND_PRINT(" for %s > %s", ipaddr_string(ndo, bp + 8),
                          ipaddr_string(ndo, bp + 12));
                break;
@@ -305,7 +305,7 @@ pimv1_print(netdissect_options *ndo,
                }
                break;
        case PIMV1_TYPE_ASSERT:
-               ND_TCHECK_LEN(bp + 16, sizeof(struct in_addr));
+               ND_TCHECK_LEN(bp + 16, sizeof(nd_ipv4));
                ND_PRINT(" for %s > %s", ipaddr_string(ndo, bp + 16),
                          ipaddr_string(ndo, bp + 8));
                if (EXTRACT_BE_U_4(bp + 12) != 0xffffffff)
@@ -575,11 +575,11 @@ pimv2_addr_print(netdissect_options *ndo,
                switch (EXTRACT_U_1(bp)) {
                case 1:
                        af = AF_INET;
-                       addr_len = (u_int)sizeof(struct in_addr);
+                       addr_len = (u_int)sizeof(nd_ipv4);
                        break;
                case 2:
                        af = AF_INET6;
-                       addr_len = (u_int)sizeof(struct in6_addr);
+                       addr_len = (u_int)sizeof(nd_ipv6);
                        break;
                default:
                        return -1;
@@ -589,10 +589,10 @@ pimv2_addr_print(netdissect_options *ndo,
                hdrlen = 2;
        } else {
                switch (addr_len) {
-               case sizeof(struct in_addr):
+               case sizeof(nd_ipv4):
                        af = AF_INET;
                        break;
-               case sizeof(struct in6_addr):
+               case sizeof(nd_ipv6):
                        af = AF_INET6;
                        break;
                default:
@@ -715,7 +715,7 @@ pimv2_print(netdissect_options *ndo,
 
        if (len < 4)
                goto trunc;
-       ND_TCHECK(pim->pim_cksum);
+       ND_TCHECK_2(pim->pim_cksum);
        ND_PRINT(", cksum 0x%04x ", EXTRACT_BE_U_2(pim->pim_cksum));
        if (EXTRACT_BE_U_2(pim->pim_cksum) == 0) {
                ND_PRINT("(unverified)");
@@ -893,13 +893,13 @@ pimv2_print(netdissect_options *ndo,
                if (len == 0)
                        goto trunc;
                ip = (const struct ip *)bp;
-               ND_TCHECK(ip->ip_vhl);
+               ND_TCHECK_1(ip->ip_vhl);
                switch (IP_V(ip)) {
                 case 0: /* Null header */
-                       ND_TCHECK(ip->ip_dst);
+                       ND_TCHECK_4(ip->ip_dst);
                        ND_PRINT("IP-Null-header %s > %s",
-                                 ipaddr_string(ndo, &ip->ip_src),
-                                 ipaddr_string(ndo, &ip->ip_dst));
+                                 ipaddr_string(ndo, ip->ip_src),
+                                 ipaddr_string(ndo, ip->ip_dst));
                        break;
 
                case 4: /* IPv4 */