Fix the pointer tests in the non-ndoified TTEST2() macro as well.

[tcpdump] / print-ip.c

diff --git a/print-ip.c b/print-ip.c
index 597f08b8ca26c4ff7b22e6b9b0811608d1b47a1b..362465e698defc7804718061be1acbb7d494c54e 100644 (file)
--- a/print-ip.c
+++ b/print-ip.c
@@ -28,8 +28,8 @@
 
 #include <string.h>
 
-#include "addrtoname.h"
 #include "interface.h"
+#include "addrtoname.h"
 #include "extract.h"                   /* must come after interface.h */
 
 #include "ip.h"
@@ -71,7 +71,7 @@ ip_printroute(netdissect_options *ndo,
                ND_PRINT((ndo, " [bad ptr %u]", cp[2]));
 
        for (len = 3; len < length; len += 4) {
-               ND_PRINT((ndo, " %s", ipaddr_string(&cp[len])));
+               ND_PRINT((ndo, " %s", ipaddr_string(ndo, &cp[len])));
                if (ptr > len)
                        ND_PRINT((ndo, ","));
        }
@@ -84,14 +84,14 @@ ip_printroute(netdissect_options *ndo,
  * This is used for UDP and TCP pseudo-header in the checksum
  * calculation.
  */
-static u_int32_t
+static uint32_t
 ip_finddst(netdissect_options *ndo,
            const struct ip *ip)
 {
        int length;
        int len;
        const u_char *cp;
-       u_int32_t retval;
+       uint32_t retval;
 
        cp = (const u_char *)(ip + 1);
        length = (IP_HL(ip) << 2) - sizeof(struct ip);
@@ -123,7 +123,7 @@ ip_finddst(netdissect_options *ndo,
                }
        }
 trunc:
-       UNALIGNED_MEMCPY(&retval, &ip->ip_dst.s_addr, sizeof(u_int32_t));
+       UNALIGNED_MEMCPY(&retval, &ip->ip_dst.s_addr, sizeof(uint32_t));
        return retval;
 }
 
@@ -132,29 +132,29 @@ trunc:
  */
 int
 nextproto4_cksum(netdissect_options *ndo,
-                 const struct ip *ip, const u_int8_t *data,
+                 const struct ip *ip, const uint8_t *data,
                  u_int len, u_int covlen, u_int next_proto)
 {
        struct phdr {
-               u_int32_t src;
-               u_int32_t dst;
+               uint32_t src;
+               uint32_t dst;
                u_char mbz;
                u_char proto;
-               u_int16_t len;
+               uint16_t len;
        } ph;
        struct cksum_vec vec[2];
 
        /* pseudo-header.. */
-       ph.len = htons((u_int16_t)len);
+       ph.len = htons((uint16_t)len);
        ph.mbz = 0;
        ph.proto = next_proto;
-       UNALIGNED_MEMCPY(&ph.src, &ip->ip_src.s_addr, sizeof(u_int32_t));
+       UNALIGNED_MEMCPY(&ph.src, &ip->ip_src.s_addr, sizeof(uint32_t));
        if (IP_HL(ip) == 5)
-               UNALIGNED_MEMCPY(&ph.dst, &ip->ip_dst.s_addr, sizeof(u_int32_t));
+               UNALIGNED_MEMCPY(&ph.dst, &ip->ip_dst.s_addr, sizeof(uint32_t));
        else
                ph.dst = ip_finddst(ndo, ip);
 
-       vec[0].ptr = (const u_int8_t *)(void *)&ph;
+       vec[0].ptr = (const uint8_t *)(void *)&ph;
        vec[0].len = sizeof(ph);
        vec[1].ptr = data;
        vec[1].len = covlen;
@@ -211,7 +211,7 @@ ip_printts(netdissect_options *ndo,
                if (ptr == len)
                        type = " ^ ";
                ND_PRINT((ndo, "%s%d@%s", type, EXTRACT_32BITS(&cp[len+hoplen-4]),
-                      hoplen!=8 ? "" : ipaddr_string(&cp[len])));
+                      hoplen!=8 ? "" : ipaddr_string(ndo, &cp[len])));
                type = " ";
        }
 
@@ -444,7 +444,7 @@ again:
 #endif /*INET6*/
 
        case IPPROTO_RSVP:
-               rsvp_print(ipds->cp, ipds->len);
+               rsvp_print(ndo, ipds->cp, ipds->len);
                break;
 
        case IPPROTO_GRE:
@@ -466,14 +466,14 @@ again:
                if (ndo->ndo_packettype == PT_CARP) {
                        if (ndo->ndo_vflag)
                                ND_PRINT((ndo, "carp %s > %s: ",
-                                            ipaddr_string(&ipds->ip->ip_src),
-                                            ipaddr_string(&ipds->ip->ip_dst)));
+                                            ipaddr_string(ndo, &ipds->ip->ip_src),
+                                            ipaddr_string(ndo, &ipds->ip->ip_dst)));
                        carp_print(ndo, ipds->cp, ipds->len, ipds->ip->ip_ttl);
                } else {
                        if (ndo->ndo_vflag)
                                ND_PRINT((ndo, "vrrp %s > %s: ",
-                                            ipaddr_string(&ipds->ip->ip_src),
-                                            ipaddr_string(&ipds->ip->ip_dst)));
+                                            ipaddr_string(ndo, &ipds->ip->ip_src),
+                                            ipaddr_string(ndo, &ipds->ip->ip_dst)));
                        vrrp_print(ndo, ipds->cp, ipds->len,
                                (const u_char *)ipds->ip, ipds->ip->ip_ttl);
                }
@@ -525,7 +525,7 @@ ip_print(netdissect_options *ndo,
        const u_char *ipend;
        u_int hlen;
        struct cksum_vec vec[1];
-       u_int16_t sum, ip_sum;
+       uint16_t sum, ip_sum;
        struct protoent *proto;
 
        ipds->ip = (const struct ip *)bp;
@@ -623,7 +623,7 @@ ip_print(netdissect_options *ndo,
             }
 
            if (!ndo->ndo_Kflag && (u_char *)ipds->ip + hlen <= ndo->ndo_snapend) {
-               vec[0].ptr = (const u_int8_t *)(void *)ipds->ip;
+               vec[0].ptr = (const uint8_t *)(void *)ipds->ip;
                vec[0].len = hlen;
                sum = in_cksum(vec, 1);
                if (sum != 0) {
@@ -647,8 +647,8 @@ ip_print(netdissect_options *ndo,
                if (ipds->nh != IPPROTO_TCP && ipds->nh != IPPROTO_UDP &&
                    ipds->nh != IPPROTO_SCTP && ipds->nh != IPPROTO_DCCP) {
                        ND_PRINT((ndo, "%s > %s: ",
-                                    ipaddr_string(&ipds->ip->ip_src),
-                                    ipaddr_string(&ipds->ip->ip_dst)));
+                                    ipaddr_string(ndo, &ipds->ip->ip_src),
+                                    ipaddr_string(ndo, &ipds->ip->ip_dst)));
                }
                ip_print_demux(ndo, ipds);
        } else {
@@ -661,8 +661,8 @@ ip_print(netdissect_options *ndo,
             * and the protocol.
             */
                if (ipds->off & 0x1fff) {
-                       ND_PRINT((ndo, "%s > %s:", ipaddr_string(&ipds->ip->ip_src),
-                                 ipaddr_string(&ipds->ip->ip_dst)));
+                       ND_PRINT((ndo, "%s > %s:", ipaddr_string(ndo, &ipds->ip->ip_src),
+                                 ipaddr_string(ndo, &ipds->ip->ip_dst)));
                        if (!ndo->ndo_nflag && (proto = getprotobynumber(ipds->ip->ip_p)) != NULL)
                                ND_PRINT((ndo, " %s", proto->p_name));
                        else