ICMP: Replace a 'struct in_addr' member type with a 'nd_ipv4' one

[tcpdump] / print-pim.c

diff --git a/print-pim.c b/print-pim.c
index 5dc311f1dfb4e125596a0daafb1024afc5590259..e9bb9a716c87e289d37ac264ae4f160d9851f89f 100644 (file)
--- a/print-pim.c
+++ b/print-pim.c
@@ -22,10 +22,10 @@
 /* \summary: Protocol Independent Multicast (PIM) printer */
 
 #ifdef HAVE_CONFIG_H
 /* \summary: Protocol Independent Multicast (PIM) printer */
 
 #ifdef HAVE_CONFIG_H

-#include "config.h"
+#include <config.h>

 #endif
 
 #endif
 

-#include <netdissect-stdinc.h>
+#include "netdissect-stdinc.h"

 
 #include "netdissect.h"
 #include "addrtoname.h"
 
 #include "netdissect.h"
 #include "addrtoname.h"


@@ -715,7 +715,7 @@ pimv2_print(netdissect_options *ndo,
 
        if (len < 4)
                goto trunc;
 
        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)");
        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,10 +893,10 @@ pimv2_print(netdissect_options *ndo,
                if (len == 0)
                        goto trunc;
                ip = (const struct ip *)bp;
                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 */
                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));
                        ND_PRINT("IP-Null-header %s > %s",
                                  ipaddr_string(ndo, &ip->ip_src),
                                  ipaddr_string(ndo, &ip->ip_dst));