Have all Internet-checksum computing routines return a uint16_t.

[tcpdump] / print-ip.c

diff --git a/print-ip.c b/print-ip.c
index 8e58299dd6006c62a8120578a3e250274a8d7bd8..e1085e96af8ec759c0e37dfda2206120233d29a0 100644 (file)
--- a/print-ip.c
+++ b/print-ip.c
@@ -22,10 +22,10 @@
 /* \summary: IP printer */
 
 #ifdef HAVE_CONFIG_H
 /* \summary: IP printer */
 
 #ifdef HAVE_CONFIG_H

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

 #endif
 
 #endif
 

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

 
 #include <string.h>
 
 
 #include <string.h>
 


@@ -36,7 +36,6 @@
 #include "ip.h"
 #include "ipproto.h"
 
 #include "ip.h"
 #include "ipproto.h"
 

-static const char tstr[] = "[|ip]";

 
 static const struct tok ip_option_values[] = {
     { IPOPT_EOL, "EOL" },
 
 static const struct tok ip_option_values[] = {
     { IPOPT_EOL, "EOL" },


@@ -56,27 +55,27 @@ static const struct tok ip_option_values[] = {
  */
 static int
 ip_printroute(netdissect_options *ndo,
  */
 static int
 ip_printroute(netdissect_options *ndo,

-              register const u_char *cp, u_int length)
+              const u_char *cp, u_int length)

 {
 {

-       register u_int ptr;
-       register u_int len;
+       u_int ptr;
+       u_int len;

 
        if (length < 3) {
 
        if (length < 3) {

-               ND_PRINT((ndo, " [bad length %u]", length));
+               ND_PRINT(" [bad length %u]", length);

                return (0);
        }
        if ((length + 1) & 3)
                return (0);
        }
        if ((length + 1) & 3)

-               ND_PRINT((ndo, " [bad length %u]", length));
-       ND_TCHECK(cp[2]);
-       ptr = cp[2] - 1;
+               ND_PRINT(" [bad length %u]", length);
+       ND_TCHECK_1(cp + 2);
+       ptr = EXTRACT_U_1(cp + 2) - 1;

        if (ptr < 3 || ((ptr + 1) & 3) || ptr > length + 1)
        if (ptr < 3 || ((ptr + 1) & 3) || ptr > length + 1)

-               ND_PRINT((ndo, " [bad ptr %u]", cp[2]));
+               ND_PRINT(" [bad ptr %u]", EXTRACT_U_1(cp + 2));

 
        for (len = 3; len < length; len += 4) {
 
        for (len = 3; len < length; len += 4) {

-               ND_TCHECK2(cp[len], 4);
-               ND_PRINT((ndo, " %s", ipaddr_string(ndo, &cp[len])));
+               ND_TCHECK_4(cp + len);
+               ND_PRINT(" %s", ipaddr_string(ndo, cp + len));

                if (ptr > len)
                if (ptr > len)

-                       ND_PRINT((ndo, ","));
+                       ND_PRINT(",");

        }
        return (0);
 
        }
        return (0);
 


@@ -95,49 +94,51 @@ static uint32_t
 ip_finddst(netdissect_options *ndo,
            const struct ip *ip)
 {
 ip_finddst(netdissect_options *ndo,
            const struct ip *ip)
 {

-       int length;
-       int len;
+       u_int length;
+       u_int len;

        const u_char *cp;
        const u_char *cp;

-       uint32_t retval;

 
        cp = (const u_char *)(ip + 1);
 
        cp = (const u_char *)(ip + 1);

-       length = (IP_HL(ip) << 2) - sizeof(struct ip);
+       length = IP_HL(ip) * 4;
+       if (length < sizeof(struct ip))
+               goto trunc;
+       length -= sizeof(struct ip);

 
 

-       for (; length > 0; cp += len, length -= len) {
+       for (; length != 0; cp += len, length -= len) {

                int tt;
 
                int tt;
 

-               ND_TCHECK(*cp);
-               tt = *cp;
+               ND_TCHECK_1(cp);
+               tt = EXTRACT_U_1(cp);

                if (tt == IPOPT_EOL)
                        break;
                else if (tt == IPOPT_NOP)
                        len = 1;
                else {
                if (tt == IPOPT_EOL)
                        break;
                else if (tt == IPOPT_NOP)
                        len = 1;
                else {

-                       ND_TCHECK(cp[1]);
-                       len = cp[1];
+                       ND_TCHECK_1(cp + 1);
+                       len = EXTRACT_U_1(cp + 1);

                        if (len < 2)
                                break;
                }
                        if (len < 2)
                                break;
                }

-               ND_TCHECK2(*cp, len);
+               if (length < len)
+                       goto trunc;
+               ND_TCHECK_LEN(cp, len);

                switch (tt) {
 
                case IPOPT_SSRR:
                case IPOPT_LSRR:
                        if (len < 7)
                                break;
                switch (tt) {
 
                case IPOPT_SSRR:
                case IPOPT_LSRR:
                        if (len < 7)
                                break;

-                       UNALIGNED_MEMCPY(&retval, cp + len - 4, 4);
-                       return retval;
+                       return (EXTRACT_IPV4_TO_NETWORK_ORDER(cp + len - 4));

                }
        }
 trunc:
                }
        }
 trunc:

-       UNALIGNED_MEMCPY(&retval, &ip->ip_dst, sizeof(uint32_t));
-       return retval;
+       return (EXTRACT_IPV4_TO_NETWORK_ORDER(ip->ip_dst));

 }
 
 /*
  * Compute a V4-style checksum by building a pseudoheader.
  */
 }
 
 /*
  * Compute a V4-style checksum by building a pseudoheader.
  */

-int
+uint16_t

 nextproto4_cksum(netdissect_options *ndo,
                  const struct ip *ip, const uint8_t *data,
                  u_int len, u_int covlen, u_int next_proto)
 nextproto4_cksum(netdissect_options *ndo,
                  const struct ip *ip, const uint8_t *data,
                  u_int len, u_int covlen, u_int next_proto)


@@ -155,9 +156,9 @@ nextproto4_cksum(netdissect_options *ndo,
        ph.len = htons((uint16_t)len);
        ph.mbz = 0;
        ph.proto = next_proto;
        ph.len = htons((uint16_t)len);
        ph.mbz = 0;
        ph.proto = next_proto;

-       UNALIGNED_MEMCPY(&ph.src, &ip->ip_src, sizeof(uint32_t));
+       ph.src = EXTRACT_IPV4_TO_NETWORK_ORDER(ip->ip_src);

        if (IP_HL(ip) == 5)
        if (IP_HL(ip) == 5)

-               UNALIGNED_MEMCPY(&ph.dst, &ip->ip_dst, sizeof(uint32_t));
+               ph.dst = EXTRACT_IPV4_TO_NETWORK_ORDER(ip->ip_dst);

        else
                ph.dst = ip_finddst(ndo, ip);
 
        else
                ph.dst = ip_finddst(ndo, ip);
 


@@ -170,33 +171,34 @@ nextproto4_cksum(netdissect_options *ndo,
 
 static int
 ip_printts(netdissect_options *ndo,
 
 static int
 ip_printts(netdissect_options *ndo,

-           register const u_char *cp, u_int length)
+           const u_char *cp, u_int length)

 {
 {

-       register u_int ptr;
-       register u_int len;
-       int hoplen;
+       u_int ptr;
+       u_int len;
+       u_int hoplen;

        const char *type;
 
        if (length < 4) {
        const char *type;
 
        if (length < 4) {

-               ND_PRINT((ndo, "[bad length %u]", length));
+               ND_PRINT("[bad length %u]", length);

                return (0);
        }
                return (0);
        }

-       ND_PRINT((ndo, " TS{"));
-       hoplen = ((cp[3]&0xF) != IPOPT_TS_TSONLY) ? 8 : 4;
+       ND_PRINT(" TS{");
+       ND_TCHECK_1(cp + 3);
+       hoplen = ((EXTRACT_U_1(cp + 3) & 0xF) != IPOPT_TS_TSONLY) ? 8 : 4;

        if ((length - 4) & (hoplen-1))
        if ((length - 4) & (hoplen-1))

-               ND_PRINT((ndo, "[bad length %u]", length));
-       ND_TCHECK(cp[2]);
-       ptr = cp[2] - 1;
+               ND_PRINT("[bad length %u]", length);
+       ND_TCHECK_1(cp + 2);
+       ptr = EXTRACT_U_1(cp + 2) - 1;

        len = 0;
        if (ptr < 4 || ((ptr - 4) & (hoplen-1)) || ptr > length + 1)
        len = 0;
        if (ptr < 4 || ((ptr - 4) & (hoplen-1)) || ptr > length + 1)

-               ND_PRINT((ndo, "[bad ptr %u]", cp[2]));
-       ND_TCHECK(cp[3]);
-       switch (cp[3]&0xF) {
+               ND_PRINT("[bad ptr %u]", EXTRACT_U_1(cp + 2));
+       ND_TCHECK_1(cp + 3);
+       switch (EXTRACT_U_1(cp + 3)&0xF) {

        case IPOPT_TS_TSONLY:
        case IPOPT_TS_TSONLY:

-               ND_PRINT((ndo, "TSONLY"));
+               ND_PRINT("TSONLY");

                break;
        case IPOPT_TS_TSANDADDR:
                break;
        case IPOPT_TS_TSANDADDR:

-               ND_PRINT((ndo, "TS+ADDR"));
+               ND_PRINT("TS+ADDR");

                break;
        /*
         * prespecified should really be 3, but some ones might send 2
                break;
        /*
         * prespecified should really be 3, but some ones might send 2


@@ -205,13 +207,13 @@ ip_printts(netdissect_options *ndo,
         */
 
        case 2:
         */
 
        case 2:

-               ND_PRINT((ndo, "PRESPEC2.0"));
+               ND_PRINT("PRESPEC2.0");

                break;
        case 3:                 /* IPOPT_TS_PRESPEC */
                break;
        case 3:                 /* IPOPT_TS_PRESPEC */

-               ND_PRINT((ndo, "PRESPEC"));
+               ND_PRINT("PRESPEC");

                break;
        default:
                break;
        default:

-               ND_PRINT((ndo, "[bad ts type %d]", cp[3]&0xF));
+               ND_PRINT("[bad ts type %u]", EXTRACT_U_1(cp + 3)&0xF);

                goto done;
        }
 
                goto done;
        }
 


@@ -219,19 +221,19 @@ ip_printts(netdissect_options *ndo,
        for (len = 4; len < length; len += hoplen) {
                if (ptr == len)
                        type = " ^ ";
        for (len = 4; len < length; len += hoplen) {
                if (ptr == len)
                        type = " ^ ";

-               ND_TCHECK2(cp[len], hoplen);
-               ND_PRINT((ndo, "%s%d@%s", type, EXTRACT_BE_U_4(cp + len + hoplen - 4),
-                         hoplen!=8 ? "" : ipaddr_string(ndo, &cp[len])));
+               ND_TCHECK_LEN(cp + len, hoplen);
+               ND_PRINT("%s%u@%s", type, EXTRACT_BE_U_4(cp + len + hoplen - 4),
+                         hoplen!=8 ? "" : ipaddr_string(ndo, cp + len));

                type = " ";
        }
 
 done:
                type = " ";
        }
 
 done:

-       ND_PRINT((ndo, "%s", ptr == len ? " ^ " : ""));
+       ND_PRINT("%s", ptr == len ? " ^ " : "");

 
 

-       if (cp[3]>>4)
-               ND_PRINT((ndo, " [%d hops not recorded]} ", cp[3]>>4));
+       if (EXTRACT_U_1(cp + 3) >> 4)
+               ND_PRINT(" [%u hops not recorded]} ", EXTRACT_U_1(cp + 3)>>4);

        else
        else

-               ND_PRINT((ndo, "}"));
+               ND_PRINT("}");

        return (0);
 
 trunc:
        return (0);
 
 trunc:


@@ -240,49 +242,50 @@ trunc:
 
 /*
  * print IP options.
 
 /*
  * print IP options.

+   If truncated return -1, else 0.

  */
  */

-static void
+static int

 ip_optprint(netdissect_options *ndo,
 ip_optprint(netdissect_options *ndo,

-            register const u_char *cp, u_int length)
+            const u_char *cp, u_int length)

 {
 {

-       register u_int option_len;
+       u_int option_len;

        const char *sep = "";
 
        for (; length > 0; cp += option_len, length -= option_len) {
                u_int option_code;
 
        const char *sep = "";
 
        for (; length > 0; cp += option_len, length -= option_len) {
                u_int option_code;
 

-               ND_PRINT((ndo, "%s", sep));
+               ND_PRINT("%s", sep);

                sep = ",";
 
                sep = ",";
 

-               ND_TCHECK(*cp);
-               option_code = *cp;
+               ND_TCHECK_1(cp);
+               option_code = EXTRACT_U_1(cp);

 
 

-               ND_PRINT((ndo, "%s",
-                         tok2str(ip_option_values,"unknown %u",option_code)));
+               ND_PRINT("%s",
+                         tok2str(ip_option_values,"unknown %u",option_code));

 
                if (option_code == IPOPT_NOP ||
                     option_code == IPOPT_EOL)
                        option_len = 1;
 
                else {
 
                if (option_code == IPOPT_NOP ||
                     option_code == IPOPT_EOL)
                        option_len = 1;
 
                else {

-                       ND_TCHECK(cp[1]);
-                       option_len = cp[1];
+                       ND_TCHECK_1(cp + 1);
+                       option_len = EXTRACT_U_1(cp + 1);

                        if (option_len < 2) {
                        if (option_len < 2) {

-                               ND_PRINT((ndo, " [bad length %u]", option_len));
-                               return;
+                               ND_PRINT(" [bad length %u]", option_len);
+                               return 0;

                        }
                }
 
                if (option_len > length) {
                        }
                }
 
                if (option_len > length) {

-                       ND_PRINT((ndo, " [bad length %u]", option_len));
-                       return;
+                       ND_PRINT(" [bad length %u]", option_len);
+                       return 0;

                }
 
                }
 

-               ND_TCHECK2(*cp, option_len);
+               ND_TCHECK_LEN(cp, option_len);

 
                switch (option_code) {
                case IPOPT_EOL:
 
                switch (option_code) {
                case IPOPT_EOL:

-                       return;
+                       return 0;

 
                case IPOPT_TS:
                        if (ip_printts(ndo, cp, option_len) == -1)
 
                case IPOPT_TS:
                        if (ip_printts(ndo, cp, option_len) == -1)


@@ -298,12 +301,12 @@ ip_optprint(netdissect_options *ndo,
 
                case IPOPT_RA:
                        if (option_len < 4) {
 
                case IPOPT_RA:
                        if (option_len < 4) {

-                               ND_PRINT((ndo, " [bad length %u]", option_len));
+                               ND_PRINT(" [bad length %u]", option_len);

                                break;
                        }
                                break;
                        }

-                       ND_TCHECK(cp[3]);
+                       ND_TCHECK_1(cp + 3);

                        if (EXTRACT_BE_U_2(cp + 2) != 0)
                        if (EXTRACT_BE_U_2(cp + 2) != 0)

-                               ND_PRINT((ndo, " value %u", EXTRACT_BE_U_2(cp + 2)));
+                               ND_PRINT(" value %u", EXTRACT_BE_U_2(cp + 2));

                        break;
 
                case IPOPT_NOP:       /* nothing to print - fall through */
                        break;
 
                case IPOPT_NOP:       /* nothing to print - fall through */


@@ -312,10 +315,10 @@ ip_optprint(netdissect_options *ndo,
                        break;
                }
        }
                        break;
                }
        }

-       return;
+       return 0;

 
 trunc:
 
 trunc:

-       ND_PRINT((ndo, "%s", tstr));
+       return -1;

 }
 
 #define IP_RES 0x8000
 }
 
 #define IP_RES 0x8000


@@ -345,11 +348,12 @@ again:
        switch (ipds->nh) {
 
        case IPPROTO_AH:
        switch (ipds->nh) {
 
        case IPPROTO_AH:

-               if (!ND_TTEST(*ipds->cp)) {
-                       ND_PRINT((ndo, "[|AH]"));
+               if (!ND_TTEST_1(ipds->cp)) {
+                       ndo->ndo_protocol = "ah";
+                       nd_print_trunc(ndo);

                        break;
                }
                        break;
                }

-               ipds->nh = *ipds->cp;
+               ipds->nh = EXTRACT_U_1(ipds->cp);

                ipds->advance = ah_print(ndo, ipds->cp);
                if (ipds->advance <= 0)
                        break;
                ipds->advance = ah_print(ndo, ipds->cp);
                if (ipds->advance <= 0)
                        break;


@@ -431,7 +435,7 @@ again:
                break;
 
        case IPPROTO_ND:
                break;
 
        case IPPROTO_ND:

-               ND_PRINT((ndo, " nd %d", ipds->len));
+               ND_PRINT(" nd %u", ipds->len);

                break;
 
        case IPPROTO_EGP:
                break;
 
        case IPPROTO_EGP:


@@ -450,7 +454,7 @@ again:
                /* DVMRP multicast tunnel (ip-in-ip encapsulation) */
                ip_print(ndo, ipds->cp, ipds->len);
                if (! ndo->ndo_vflag) {
                /* DVMRP multicast tunnel (ip-in-ip encapsulation) */
                ip_print(ndo, ipds->cp, ipds->len);
                if (! ndo->ndo_vflag) {

-                       ND_PRINT((ndo, " (ipip-proto-4)"));
+                       ND_PRINT(" (ipip-proto-4)");

                        return;
                }
                break;
                        return;
                }
                break;


@@ -480,17 +484,19 @@ again:
        case IPPROTO_VRRP:
                if (ndo->ndo_packettype == PT_CARP) {
                        if (ndo->ndo_vflag)
        case IPPROTO_VRRP:
                if (ndo->ndo_packettype == PT_CARP) {
                        if (ndo->ndo_vflag)

-                               ND_PRINT((ndo, "carp %s > %s: ",
-                                            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);
+                               ND_PRINT("carp %s > %s: ",
+                                            ipaddr_string(ndo, ipds->ip->ip_src),
+                                            ipaddr_string(ndo, ipds->ip->ip_dst));
+                       carp_print(ndo, ipds->cp, ipds->len,
+                               EXTRACT_U_1(ipds->ip->ip_ttl));

                } else {
                        if (ndo->ndo_vflag)
                } else {
                        if (ndo->ndo_vflag)

-                               ND_PRINT((ndo, "vrrp %s > %s: ",
-                                            ipaddr_string(ndo, &ipds->ip->ip_src),
-                                            ipaddr_string(ndo, &ipds->ip->ip_dst)));
+                               ND_PRINT("vrrp %s > %s: ",
+                                            ipaddr_string(ndo, ipds->ip->ip_src),
+                                            ipaddr_string(ndo, ipds->ip->ip_dst));

                        vrrp_print(ndo, ipds->cp, ipds->len,
                        vrrp_print(ndo, ipds->cp, ipds->len,

-                               (const u_char *)ipds->ip, ipds->ip->ip_ttl);
+                               (const u_char *)ipds->ip,
+                               EXTRACT_U_1(ipds->ip->ip_ttl));

                }
                break;
 
                }
                break;
 


@@ -500,16 +506,16 @@ again:
 
        default:
                if (ndo->ndo_nflag==0 && (p_name = netdb_protoname(ipds->nh)) != NULL)
 
        default:
                if (ndo->ndo_nflag==0 && (p_name = netdb_protoname(ipds->nh)) != NULL)

-                       ND_PRINT((ndo, " %s", p_name));
+                       ND_PRINT(" %s", p_name);

                else
                else

-                       ND_PRINT((ndo, " ip-proto-%d", ipds->nh));
-               ND_PRINT((ndo, " %d", ipds->len));
+                       ND_PRINT(" ip-proto-%u", ipds->nh);
+               ND_PRINT(" %u", ipds->len);

                break;
        }
 }
 
 void
                break;
        }
 }
 
 void

-ip_print_inner(netdissect_options *ndo,
+ip_inner_print(netdissect_options *ndo,

               const u_char *bp,
               u_int length, u_int nh,
               const u_char *bp2)
               const u_char *bp,
               u_int length, u_int nh,
               const u_char *bp2)


@@ -540,40 +546,44 @@ ip_print(netdissect_options *ndo,
        const u_char *ipend;
        u_int hlen;
        struct cksum_vec vec[1];
        const u_char *ipend;
        u_int hlen;
        struct cksum_vec vec[1];

+       uint8_t ip_tos, ip_ttl, ip_proto;

        uint16_t sum, ip_sum;
        const char *p_name;
        uint16_t sum, ip_sum;
        const char *p_name;

+       int truncated = 0;

 
 

+       ndo->ndo_protocol = "ip";

        ipds->ip = (const struct ip *)bp;
        ipds->ip = (const struct ip *)bp;

-       ND_TCHECK(ipds->ip->ip_vhl);
+       ND_TCHECK_1(ipds->ip->ip_vhl);

        if (IP_V(ipds->ip) != 4) { /* print version and fail if != 4 */
            if (IP_V(ipds->ip) == 6)
        if (IP_V(ipds->ip) != 4) { /* print version and fail if != 4 */
            if (IP_V(ipds->ip) == 6)

-             ND_PRINT((ndo, "IP6, wrong link-layer encapsulation "));
+             ND_PRINT("IP6, wrong link-layer encapsulation");

            else
            else

-             ND_PRINT((ndo, "IP%u ", IP_V(ipds->ip)));
+             ND_PRINT("IP%u", IP_V(ipds->ip));
+           nd_print_invalid(ndo);

            return;
        }
        if (!ndo->ndo_eflag)
            return;
        }
        if (!ndo->ndo_eflag)

-               ND_PRINT((ndo, "IP "));
+               ND_PRINT("IP ");

 
 

-       ND_TCHECK(*ipds->ip);
+       ND_TCHECK_SIZE(ipds->ip);

        if (length < sizeof (struct ip)) {
        if (length < sizeof (struct ip)) {

-               ND_PRINT((ndo, "truncated-ip %u", length));
+               ND_PRINT("truncated-ip %u", length);

                return;
        }
        hlen = IP_HL(ipds->ip) * 4;
        if (hlen < sizeof (struct ip)) {
                return;
        }
        hlen = IP_HL(ipds->ip) * 4;
        if (hlen < sizeof (struct ip)) {

-               ND_PRINT((ndo, "bad-hlen %u", hlen));
+               ND_PRINT("bad-hlen %u", hlen);

                return;
        }
 
                return;
        }
 

-       ipds->len = EXTRACT_BE_U_2(&ipds->ip->ip_len);
+       ipds->len = EXTRACT_BE_U_2(ipds->ip->ip_len);

        if (length < ipds->len)
        if (length < ipds->len)

-               ND_PRINT((ndo, "truncated-ip - %u bytes missing! ",
-                       ipds->len - length));
+               ND_PRINT("truncated-ip - %u bytes missing! ",
+                       ipds->len - length);

        if (ipds->len < hlen) {
 #ifdef GUESS_TSO
             if (ipds->len) {
        if (ipds->len < hlen) {
 #ifdef GUESS_TSO
             if (ipds->len) {

-                ND_PRINT((ndo, "bad-len %u", ipds->len));
+                ND_PRINT("bad-len %u", ipds->len);

                 return;
             }
             else {
                 return;
             }
             else {


@@ -581,7 +591,7 @@ ip_print(netdissect_options *ndo,
                 ipds->len = length;
             }
 #else
                 ipds->len = length;
             }
 #else

-            ND_PRINT((ndo, "bad-len %u", ipds->len));
+            ND_PRINT("bad-len %u", ipds->len);

             return;
 #endif /* GUESS_TSO */
        }
             return;
 #endif /* GUESS_TSO */
        }


@@ -595,51 +605,58 @@ ip_print(netdissect_options *ndo,
 
        ipds->len -= hlen;
 
 
        ipds->len -= hlen;
 

-       ipds->off = EXTRACT_BE_U_2(&ipds->ip->ip_off);
+       ipds->off = EXTRACT_BE_U_2(ipds->ip->ip_off);
+
+        ip_proto = EXTRACT_U_1(ipds->ip->ip_p);

 
         if (ndo->ndo_vflag) {
 
         if (ndo->ndo_vflag) {

-            ND_PRINT((ndo, "(tos 0x%x", ipds->ip->ip_tos));
+            ip_tos = EXTRACT_U_1(ipds->ip->ip_tos);
+            ND_PRINT("(tos 0x%x", ip_tos);

             /* ECN bits */
             /* ECN bits */

-            switch (ipds->ip->ip_tos & 0x03) {
+            switch (ip_tos & 0x03) {

 
             case 0:
                 break;
 
             case 1:
 
             case 0:
                 break;
 
             case 1:

-                ND_PRINT((ndo, ",ECT(1)"));
+                ND_PRINT(",ECT(1)");

                 break;
 
             case 2:
                 break;
 
             case 2:

-                ND_PRINT((ndo, ",ECT(0)"));
+                ND_PRINT(",ECT(0)");

                 break;
 
             case 3:
                 break;
 
             case 3:

-                ND_PRINT((ndo, ",CE"));
+                ND_PRINT(",CE");

                 break;
             }
 
                 break;
             }
 

-            if (ipds->ip->ip_ttl >= 1)
-                ND_PRINT((ndo, ", ttl %u", ipds->ip->ip_ttl));
+            ip_ttl = EXTRACT_U_1(ipds->ip->ip_ttl);
+            if (ip_ttl >= 1)
+                ND_PRINT(", ttl %u", ip_ttl);

 
            /*
             * for the firewall guys, print id, offset.
              * On all but the last stick a "+" in the flags portion.
             * For unfragmented datagrams, note the don't fragment flag.
             */
 
            /*
             * for the firewall guys, print id, offset.
              * On all but the last stick a "+" in the flags portion.
             * For unfragmented datagrams, note the don't fragment flag.
             */

-
-           ND_PRINT((ndo, ", id %u, offset %u, flags [%s], proto %s (%u)",
-                         EXTRACT_BE_U_2(&ipds->ip->ip_id),
+           ND_PRINT(", id %u, offset %u, flags [%s], proto %s (%u)",
+                         EXTRACT_BE_U_2(ipds->ip->ip_id),

                          (ipds->off & 0x1fff) * 8,
                          bittok2str(ip_frag_values, "none", ipds->off&0xe000),
                          (ipds->off & 0x1fff) * 8,
                          bittok2str(ip_frag_values, "none", ipds->off&0xe000),

-                         tok2str(ipproto_values,"unknown",ipds->ip->ip_p),
-                         ipds->ip->ip_p));
+                         tok2str(ipproto_values, "unknown", ip_proto),
+                         ip_proto);

 
 

-            ND_PRINT((ndo, ", length %u", EXTRACT_BE_U_2(&ipds->ip->ip_len)));
+            ND_PRINT(", length %u", EXTRACT_BE_U_2(ipds->ip->ip_len));

 
             if ((hlen - sizeof(struct ip)) > 0) {
 
             if ((hlen - sizeof(struct ip)) > 0) {

-                ND_PRINT((ndo, ", options ("));
-                ip_optprint(ndo, (const u_char *)(ipds->ip + 1), hlen - sizeof(struct ip));
-                ND_PRINT((ndo, ")"));
+                ND_PRINT(", options (");
+                if (ip_optprint(ndo, (const u_char *)(ipds->ip + 1),
+                    hlen - sizeof(struct ip)) == -1) {
+                        ND_PRINT(" [truncated-option]");
+                       truncated = 1;
+                }
+                ND_PRINT(")");

             }
 
            if (!ndo->ndo_Kflag && (const u_char *)ipds->ip + hlen <= ndo->ndo_snapend) {
             }
 
            if (!ndo->ndo_Kflag && (const u_char *)ipds->ip + hlen <= ndo->ndo_snapend) {


@@ -647,13 +664,19 @@ ip_print(netdissect_options *ndo,
                vec[0].len = hlen;
                sum = in_cksum(vec, 1);
                if (sum != 0) {
                vec[0].len = hlen;
                sum = in_cksum(vec, 1);
                if (sum != 0) {

-                   ip_sum = EXTRACT_BE_U_2(&ipds->ip->ip_sum);
-                   ND_PRINT((ndo, ", bad cksum %x (->%x)!", ip_sum,
-                            in_cksum_shouldbe(ip_sum, sum)));
+                   ip_sum = EXTRACT_BE_U_2(ipds->ip->ip_sum);
+                   ND_PRINT(", bad cksum %x (->%x)!", ip_sum,
+                            in_cksum_shouldbe(ip_sum, sum));

                }
            }
 
                }
            }
 

-               ND_PRINT((ndo, ")\n    "));
+           ND_PRINT(")\n    ");
+           if (truncated) {
+               ND_PRINT("%s > %s: ",
+                        ipaddr_string(ndo, ipds->ip->ip_src),
+                        ipaddr_string(ndo, ipds->ip->ip_dst));
+               goto trunc;
+           }

        }
 
        /*
        }
 
        /*


@@ -662,13 +685,13 @@ ip_print(netdissect_options *ndo,
         */
        if ((ipds->off & 0x1fff) == 0) {
                ipds->cp = (const u_char *)ipds->ip + hlen;
         */
        if ((ipds->off & 0x1fff) == 0) {
                ipds->cp = (const u_char *)ipds->ip + hlen;

-               ipds->nh = ipds->ip->ip_p;
+               ipds->nh = EXTRACT_U_1(ipds->ip->ip_p);

 
                if (ipds->nh != IPPROTO_TCP && ipds->nh != IPPROTO_UDP &&
                    ipds->nh != IPPROTO_SCTP && ipds->nh != IPPROTO_DCCP) {
 
                if (ipds->nh != IPPROTO_TCP && ipds->nh != IPPROTO_UDP &&
                    ipds->nh != IPPROTO_SCTP && ipds->nh != IPPROTO_DCCP) {

-                       ND_PRINT((ndo, "%s > %s: ",
-                                    ipaddr_string(ndo, &ipds->ip->ip_src),
-                                    ipaddr_string(ndo, &ipds->ip->ip_dst)));
+                       ND_PRINT("%s > %s: ",
+                                    ipaddr_string(ndo, ipds->ip->ip_src),
+                                    ipaddr_string(ndo, ipds->ip->ip_dst));

                }
                ip_print_demux(ndo, ipds);
        } else {
                }
                ip_print_demux(ndo, ipds);
        } else {


@@ -684,52 +707,44 @@ ip_print(netdissect_options *ndo,
                 * next level protocol header.  print the ip addr
                 * and the protocol.
                 */
                 * next level protocol header.  print the ip addr
                 * and the protocol.
                 */

-               ND_PRINT((ndo, "%s > %s:", ipaddr_string(ndo, &ipds->ip->ip_src),
-                         ipaddr_string(ndo, &ipds->ip->ip_dst)));
-               if (!ndo->ndo_nflag && (p_name = netdb_protoname(ipds->ip->ip_p)) != NULL)
-                       ND_PRINT((ndo, " %s", p_name));
+               ND_PRINT("%s > %s:", ipaddr_string(ndo, ipds->ip->ip_src),
+                         ipaddr_string(ndo, ipds->ip->ip_dst));
+               if (!ndo->ndo_nflag && (p_name = netdb_protoname(ip_proto)) != NULL)
+                       ND_PRINT(" %s", p_name);

                else
                else

-                       ND_PRINT((ndo, " ip-proto-%d", ipds->ip->ip_p));
+                       ND_PRINT(" ip-proto-%u", ip_proto);

        }
        return;
 
 trunc:
        }
        return;
 
 trunc:

-       ND_PRINT((ndo, "%s", tstr));
+       nd_print_trunc(ndo);

        return;
 }
 
 void
        return;
 }
 
 void

-ipN_print(netdissect_options *ndo, register const u_char *bp, register u_int length)
+ipN_print(netdissect_options *ndo, const u_char *bp, u_int length)

 {
 {

+       ndo->ndo_protocol = "ipN";

        if (length < 1) {
        if (length < 1) {

-               ND_PRINT((ndo, "truncated-ip %d", length));
+               ND_PRINT("truncated-ip %u", length);

                return;
        }
 
                return;
        }
 

-       ND_TCHECK(*bp);
-       switch (*bp & 0xF0) {
+       ND_TCHECK_1(bp);
+       switch (EXTRACT_U_1(bp) & 0xF0) {

        case 0x40:
        case 0x40:

-               ip_print (ndo, bp, length);
+               ip_print(ndo, bp, length);

                break;
        case 0x60:
                break;
        case 0x60:

-               ip6_print (ndo, bp, length);
+               ip6_print(ndo, bp, length);

                break;
        default:
                break;
        default:

-               ND_PRINT((ndo, "unknown ip %d", (EXTRACT_U_1(bp) & 0xF0) >> 4));
+               ND_PRINT("unknown ip %u", (EXTRACT_U_1(bp) & 0xF0) >> 4);

                break;
        }
        return;
 
 trunc:
                break;
        }
        return;
 
 trunc:

-       ND_PRINT((ndo, "%s", tstr));
+       nd_print_trunc(ndo);

        return;
 }
        return;
 }

-
-/*
- * Local Variables:
- * c-style: whitesmith
- * c-basic-offset: 8
- * End:
- */
-
-