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 cb775f48614ebb34cbeb19f8f33155605edb5fb2..362465e698defc7804718061be1acbb7d494c54e 100644 (file)
--- a/print-ip.c
+++ b/print-ip.c
@@ -19,123 +19,175 @@
  * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  */
 
  * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  */
 

-#ifndef lint
-static const char rcsid[] =
-    "@(#) $Header: /tcpdump/master/tcpdump/print-ip.c,v 1.124 2003-05-15 16:58:04 hannes Exp $ (LBL)";
-#endif
-
+#define NETDISSECT_REWORKED

 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
 
 #include <tcpdump-stdinc.h>
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
 
 #include <tcpdump-stdinc.h>
 

-#include <stdio.h>
-#include <stdlib.h>

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

-#include "addrtoname.h"

 #include "interface.h"
 #include "interface.h"

+#include "addrtoname.h"

 #include "extract.h"                   /* must come after interface.h */
 
 #include "ip.h"
 #include "extract.h"                   /* must come after interface.h */
 
 #include "ip.h"

-
-/* Compatibility */
-#ifndef        IPPROTO_ND
-#define        IPPROTO_ND      77
-#endif
+#include "ipproto.h"
+
+static const char tstr[] = "[|ip]";
+
+static const struct tok ip_option_values[] = {
+    { IPOPT_EOL, "EOL" },
+    { IPOPT_NOP, "NOP" },
+    { IPOPT_TS, "timestamp" },
+    { IPOPT_SECURITY, "security" },
+    { IPOPT_RR, "RR" },
+    { IPOPT_SSRR, "SSRR" },
+    { IPOPT_LSRR, "LSRR" },
+    { IPOPT_RA, "RA" },
+    { IPOPT_RFC1393, "traceroute" },
+    { 0, NULL }
+};

 
 /*
  * print the recorded route in an IP RR, LSRR or SSRR option.
  */
 static void
 
 /*
  * print the recorded route in an IP RR, LSRR or SSRR option.
  */
 static void

-ip_printroute(const char *type, register const u_char *cp, u_int length)
+ip_printroute(netdissect_options *ndo,
+              register const u_char *cp, u_int length)

 {
 {

-       register u_int ptr = cp[2] - 1;
+       register u_int ptr;

        register u_int len;
 
        register u_int len;
 

-       printf(" %s{", type);
+       if (length < 3) {
+               ND_PRINT((ndo, " [bad length %u]", length));
+               return;
+       }

        if ((length + 1) & 3)
        if ((length + 1) & 3)

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

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

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

 
 

-       type = "";

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

-               if (ptr == len)
-                       type = "#";
-               printf("%s%s", type, ipaddr_string(&cp[len]));
-               type = " ";
+               ND_PRINT((ndo, " %s", ipaddr_string(ndo, &cp[len])));
+               if (ptr > len)
+                       ND_PRINT((ndo, ","));

        }
        }

-       printf("%s}", ptr == len? "#" : "");

 }
 
 /*
 }
 
 /*

- * If source-routing is present, return the final destination.
+ * If source-routing is present and valid, return the final destination.

  * Otherwise, return IP destination.
  *
  * This is used for UDP and TCP pseudo-header in the checksum
  * calculation.
  */
  * Otherwise, return IP destination.
  *
  * This is used for UDP and TCP pseudo-header in the checksum
  * calculation.
  */

-u_int32_t
-ip_finddst(const struct ip *ip)
+static uint32_t
+ip_finddst(netdissect_options *ndo,
+           const struct ip *ip)

 {
        int length;
        int len;
        const u_char *cp;
 {
        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);
 
        for (; length > 0; cp += len, length -= len) {
 
        cp = (const u_char *)(ip + 1);
        length = (IP_HL(ip) << 2) - sizeof(struct ip);
 
        for (; length > 0; cp += len, length -= len) {

-               int tt = *cp;
+               int tt;

 
 

-               if (tt == IPOPT_NOP || tt == IPOPT_EOL)
+               ND_TCHECK(*cp);
+               tt = *cp;
+               if (tt == IPOPT_EOL)
+                       break;
+               else if (tt == IPOPT_NOP)

                        len = 1;
                else {
                        len = 1;
                else {

-                       if (&cp[1] >= snapend) {
-                               return 0;
-                       }
+                       ND_TCHECK(cp[1]);

                        len = cp[1];
                        len = cp[1];

+                       if (len < 2)
+                               break;

                }
                }

-               if (len <= 0) {
-                       return 0;
-               }
-               if (&cp[1] >= snapend || cp + len > snapend) {
-                       return 0;
-               }
+               ND_TCHECK2(*cp, len);

                switch (tt) {
 
                case IPOPT_SSRR:
                case IPOPT_LSRR:
                switch (tt) {
 
                case IPOPT_SSRR:
                case IPOPT_LSRR:

-                       memcpy(&retval, cp + len - 4, 4);
+                       if (len < 7)
+                               break;
+                       UNALIGNED_MEMCPY(&retval, cp + len - 4, 4);

                        return retval;
                }
        }
                        return retval;
                }
        }

-       return ip->ip_dst.s_addr;
+trunc:
+       UNALIGNED_MEMCPY(&retval, &ip->ip_dst.s_addr, sizeof(uint32_t));
+       return retval;
+}
+
+/*
+ * Compute a V4-style checksum by building a pseudoheader.
+ */
+int
+nextproto4_cksum(netdissect_options *ndo,
+                 const struct ip *ip, const uint8_t *data,
+                 u_int len, u_int covlen, u_int next_proto)
+{
+       struct phdr {
+               uint32_t src;
+               uint32_t dst;
+               u_char mbz;
+               u_char proto;
+               uint16_t len;
+       } ph;
+       struct cksum_vec vec[2];
+
+       /* pseudo-header.. */
+       ph.len = htons((uint16_t)len);
+       ph.mbz = 0;
+       ph.proto = next_proto;
+       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(uint32_t));
+       else
+               ph.dst = ip_finddst(ndo, ip);
+
+       vec[0].ptr = (const uint8_t *)(void *)&ph;
+       vec[0].len = sizeof(ph);
+       vec[1].ptr = data;
+       vec[1].len = covlen;
+       return (in_cksum(vec, 2));

 }
 
 static void
 }
 
 static void

-ip_printts(register const u_char *cp, u_int length)
+ip_printts(netdissect_options *ndo,
+           register const u_char *cp, u_int length)

 {
 {

-       register u_int ptr = cp[2] - 1;
-       register u_int len = 0;
+       register u_int ptr;
+       register u_int len;

        int hoplen;
        const char *type;
 
        int hoplen;
        const char *type;
 

-       printf(" TS{");
+       if (length < 4) {
+               ND_PRINT((ndo, "[bad length %u]", length));
+               return;
+       }
+       ND_PRINT((ndo, " TS{"));

        hoplen = ((cp[3]&0xF) != IPOPT_TS_TSONLY) ? 8 : 4;
        if ((length - 4) & (hoplen-1))
        hoplen = ((cp[3]&0xF) != IPOPT_TS_TSONLY) ? 8 : 4;
        if ((length - 4) & (hoplen-1))

-               printf("[bad length %d]", length);
+               ND_PRINT((ndo, "[bad length %u]", length));
+       ptr = cp[2] - 1;
+       len = 0;

        if (ptr < 4 || ((ptr - 4) & (hoplen-1)) || ptr > length + 1)
        if (ptr < 4 || ((ptr - 4) & (hoplen-1)) || ptr > length + 1)

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

        switch (cp[3]&0xF) {
        case IPOPT_TS_TSONLY:
        switch (cp[3]&0xF) {
        case IPOPT_TS_TSONLY:

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

                break;
        case IPOPT_TS_TSANDADDR:
                break;
        case IPOPT_TS_TSANDADDR:

-               printf("TS+ADDR");
+               ND_PRINT((ndo, "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


@@ -144,13 +196,13 @@ ip_printts(register const u_char *cp, u_int length)
         */
 
        case 2:
         */
 
        case 2:

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

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

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

                break;
        default:
                break;
        default:

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

                goto done;
        }
 
                goto done;
        }
 


@@ -158,261 +210,396 @@ ip_printts(register const u_char *cp, u_int length)
        for (len = 4; len < length; len += hoplen) {
                if (ptr == len)
                        type = " ^ ";
        for (len = 4; len < length; len += hoplen) {
                if (ptr == len)
                        type = " ^ ";

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

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

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

 
        if (cp[3]>>4)
 
        if (cp[3]>>4)

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

        else
        else

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

 }
 
 /*
  * print IP options.
  */
 static void
 }
 
 /*
  * print IP options.
  */
 static void

-ip_optprint(register const u_char *cp, u_int length)
+ip_optprint(netdissect_options *ndo,
+            register const u_char *cp, u_int length)

 {
 {

-       register u_int len;
+       register u_int option_len;
+       const char *sep = "";

 
 

-       for (; length > 0; cp += len, length -= len) {
-               int tt = *cp;
+       for (; length > 0; cp += option_len, length -= option_len) {
+               u_int option_code;
+
+               ND_PRINT((ndo, "%s", sep));
+               sep = ",";
+
+               ND_TCHECK(*cp);
+               option_code = *cp;
+
+               ND_PRINT((ndo, "%s",
+                         tok2str(ip_option_values,"unknown %u",option_code)));
+
+               if (option_code == IPOPT_NOP ||
+                    option_code == IPOPT_EOL)
+                       option_len = 1;

 
 

-               if (tt == IPOPT_NOP || tt == IPOPT_EOL)
-                       len = 1;

                else {
                else {

-                       if (&cp[1] >= snapend) {
-                               printf("[|ip]");
+                       ND_TCHECK(cp[1]);
+                       option_len = cp[1];
+                       if (option_len < 2) {
+                               ND_PRINT((ndo, " [bad length %u]", option_len));

                                return;
                        }
                                return;
                        }

-                       len = cp[1];

                }
                }

-               if (len <= 0) {
-                       printf("[|ip op len %d]", len);
-                       return;
-               }
-               if (&cp[1] >= snapend || cp + len > snapend) {
-                       printf("[|ip]");
+
+               if (option_len > length) {
+                       ND_PRINT((ndo, " [bad length %u]", option_len));

                        return;
                }
                        return;
                }

-               switch (tt) {

 
 

+               ND_TCHECK2(*cp, option_len);
+
+               switch (option_code) {

                case IPOPT_EOL:
                case IPOPT_EOL:

-                       printf(" EOL");
-                       if (length > 1)
-                               printf("-%d", length - 1);

                        return;
 
                        return;
 

-               case IPOPT_NOP:
-                       printf(" NOP");
-                       break;
-

                case IPOPT_TS:
                case IPOPT_TS:

-                       ip_printts(cp, len);
-                       break;
-
-#ifndef IPOPT_SECURITY
-#define IPOPT_SECURITY 130
-#endif /* IPOPT_SECURITY */
-               case IPOPT_SECURITY:
-                       printf(" SECURITY{%d}", len);
-                       break;
-
-               case IPOPT_RR:
-                       ip_printroute("RR", cp, len);
+                       ip_printts(ndo, cp, option_len);

                        break;
 
                        break;
 

+               case IPOPT_RR:       /* fall through */

                case IPOPT_SSRR:
                case IPOPT_SSRR:

-                       ip_printroute("SSRR", cp, len);
-                       break;
-

                case IPOPT_LSRR:
                case IPOPT_LSRR:

-                       ip_printroute("LSRR", cp, len);
+                       ip_printroute(ndo, cp, option_len);

                        break;
 
                        break;
 

-#ifndef IPOPT_RA
-#define IPOPT_RA 148           /* router alert */
-#endif

                case IPOPT_RA:
                case IPOPT_RA:

-                       printf(" RA");
-                       if (len != 4)
-                               printf("{%d}", len);
-                       else if (cp[2] || cp[3])
-                               printf("%d.%d", cp[2], cp[3]);
+                       if (option_len < 4) {
+                               ND_PRINT((ndo, " [bad length %u]", option_len));
+                               break;
+                       }
+                       ND_TCHECK(cp[3]);
+                       if (EXTRACT_16BITS(&cp[2]) != 0)
+                               ND_PRINT((ndo, " value %u", EXTRACT_16BITS(&cp[2])));

                        break;
 
                        break;
 

+               case IPOPT_NOP:       /* nothing to print - fall through */
+               case IPOPT_SECURITY:

                default:
                default:

-                       printf(" IPOPT-%d{%d}", cp[0], len);

                        break;
                }
        }
                        break;
                }
        }

+       return;
+
+trunc:
+       ND_PRINT((ndo, "%s", tstr));

 }
 
 }
 

-/*
- * compute an IP header checksum.
- * don't modifiy the packet.
- */
-u_short
-in_cksum(const u_short *addr, register u_int len, int csum)
+#define IP_RES 0x8000
+
+static const struct tok ip_frag_values[] = {
+        { IP_MF,        "+" },
+        { IP_DF,        "DF" },
+       { IP_RES,       "rsvd" }, /* The RFC3514 evil ;-) bit */
+        { 0,            NULL }
+};
+
+struct ip_print_demux_state {
+       const struct ip *ip;
+       const u_char *cp;
+       u_int   len, off;
+       u_char  nh;
+       int     advance;
+};
+
+static void
+ip_print_demux(netdissect_options *ndo,
+              struct ip_print_demux_state *ipds)

 {
 {

-       int nleft = len;
-       const u_short *w = addr;
-       u_short answer;
-       int sum = csum;
+       struct protoent *proto;
+       struct cksum_vec vec[1];

 
 

-       /*
-        *  Our algorithm is simple, using a 32 bit accumulator (sum),
-        *  we add sequential 16 bit words to it, and at the end, fold
-        *  back all the carry bits from the top 16 bits into the lower
-        *  16 bits.
-        */
-       while (nleft > 1)  {
-               sum += *w++;
-               nleft -= 2;
+again:
+       switch (ipds->nh) {
+
+       case IPPROTO_AH:
+               ipds->nh = *ipds->cp;
+               ipds->advance = ah_print(ndo, ipds->cp);
+               if (ipds->advance <= 0)
+                       break;
+               ipds->cp += ipds->advance;
+               ipds->len -= ipds->advance;
+               goto again;
+
+       case IPPROTO_ESP:
+       {
+               int enh, padlen;
+               ipds->advance = esp_print(ndo, ipds->cp, ipds->len,
+                                   (const u_char *)ipds->ip,
+                                   &enh, &padlen);
+               if (ipds->advance <= 0)
+                       break;
+               ipds->cp += ipds->advance;
+               ipds->len -= ipds->advance + padlen;
+               ipds->nh = enh & 0xff;
+               goto again;

        }
        }

-       if (nleft == 1)
-               sum += htons(*(u_char *)w<<8);

 
 

-       /*
-        * add back carry outs from top 16 bits to low 16 bits
-        */
-       sum = (sum >> 16) + (sum & 0xffff);     /* add hi 16 to low 16 */
-       sum += (sum >> 16);                     /* add carry */
-       answer = ~sum;                          /* truncate to 16 bits */
-       return (answer);
+       case IPPROTO_IPCOMP:
+       {
+               int enh;
+               ipds->advance = ipcomp_print(ndo, ipds->cp, &enh);
+               if (ipds->advance <= 0)
+                       break;
+               ipds->cp += ipds->advance;
+               ipds->len -= ipds->advance;
+               ipds->nh = enh & 0xff;
+               goto again;
+       }
+
+       case IPPROTO_SCTP:
+               sctp_print(ndo, ipds->cp, (const u_char *)ipds->ip, ipds->len);
+               break;
+
+       case IPPROTO_DCCP:
+               dccp_print(ndo, ipds->cp, (const u_char *)ipds->ip, ipds->len);
+               break;
+
+       case IPPROTO_TCP:
+               /* pass on the MF bit plus the offset to detect fragments */
+               tcp_print(ndo, ipds->cp, ipds->len, (const u_char *)ipds->ip,
+                         ipds->off & (IP_MF|IP_OFFMASK));
+               break;
+
+       case IPPROTO_UDP:
+               /* pass on the MF bit plus the offset to detect fragments */
+               udp_print(ndo, ipds->cp, ipds->len, (const u_char *)ipds->ip,
+                         ipds->off & (IP_MF|IP_OFFMASK));
+               break;
+
+       case IPPROTO_ICMP:
+               /* pass on the MF bit plus the offset to detect fragments */
+               icmp_print(ndo, ipds->cp, ipds->len, (const u_char *)ipds->ip,
+                          ipds->off & (IP_MF|IP_OFFMASK));
+               break;
+
+       case IPPROTO_PIGP:
+               /*
+                * XXX - the current IANA protocol number assignments
+                * page lists 9 as "any private interior gateway
+                * (used by Cisco for their IGRP)" and 88 as
+                * "EIGRP" from Cisco.
+                *
+                * Recent BSD <netinet/in.h> headers define
+                * IP_PROTO_PIGP as 9 and IP_PROTO_IGRP as 88.
+                * We define IP_PROTO_PIGP as 9 and
+                * IP_PROTO_EIGRP as 88; those names better
+                * match was the current protocol number
+                * assignments say.
+                */
+               igrp_print(ndo, ipds->cp, ipds->len);
+               break;
+
+       case IPPROTO_EIGRP:
+               eigrp_print(ndo, ipds->cp, ipds->len);
+               break;
+
+       case IPPROTO_ND:
+               ND_PRINT((ndo, " nd %d", ipds->len));
+               break;
+
+       case IPPROTO_EGP:
+               egp_print(ndo, ipds->cp, ipds->len);
+               break;
+
+       case IPPROTO_OSPF:
+               ospf_print(ndo, ipds->cp, ipds->len, (const u_char *)ipds->ip);
+               break;
+
+       case IPPROTO_IGMP:
+               igmp_print(ndo, ipds->cp, ipds->len);
+               break;
+
+       case IPPROTO_IPV4:
+               /* DVMRP multicast tunnel (ip-in-ip encapsulation) */
+               ip_print(ndo, ipds->cp, ipds->len);
+               if (! ndo->ndo_vflag) {
+                       ND_PRINT((ndo, " (ipip-proto-4)"));
+                       return;
+               }
+               break;
+
+#ifdef INET6
+       case IPPROTO_IPV6:
+               /* ip6-in-ip encapsulation */
+               ip6_print(ndo, ipds->cp, ipds->len);
+               break;
+#endif /*INET6*/
+
+       case IPPROTO_RSVP:
+               rsvp_print(ndo, ipds->cp, ipds->len);
+               break;
+
+       case IPPROTO_GRE:
+               /* do it */
+               gre_print(ndo, ipds->cp, ipds->len);
+               break;
+
+       case IPPROTO_MOBILE:
+               mobile_print(ndo, ipds->cp, ipds->len);
+               break;
+
+       case IPPROTO_PIM:
+               vec[0].ptr = ipds->cp;
+               vec[0].len = ipds->len;
+               pim_print(ndo, ipds->cp, ipds->len, in_cksum(vec, 1));
+               break;
+
+       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);
+               } 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)));
+                       vrrp_print(ndo, ipds->cp, ipds->len,
+                               (const u_char *)ipds->ip, ipds->ip->ip_ttl);
+               }
+               break;
+
+       case IPPROTO_PGM:
+               pgm_print(ndo, ipds->cp, ipds->len, (const u_char *)ipds->ip);
+               break;
+
+       default:
+               if (ndo->ndo_nflag==0 && (proto = getprotobynumber(ipds->nh)) != NULL)
+                       ND_PRINT((ndo, " %s", proto->p_name));
+               else
+                       ND_PRINT((ndo, " ip-proto-%d", ipds->nh));
+               ND_PRINT((ndo, " %d", ipds->len));
+               break;
+       }

 }
 
 }
 

-/*
- * Given the host-byte-order value of the checksum field in a packet
- * header, and the network-byte-order computed checksum of the data
- * that the checksum covers (including the checksum itself), compute
- * what the checksum field *should* have been.
- */
-u_int16_t
-in_cksum_shouldbe(u_int16_t sum, u_int16_t computed_sum)
+void
+ip_print_inner(netdissect_options *ndo,
+              const u_char *bp,
+              u_int length, u_int nh,
+              const u_char *bp2)

 {
 {

-       u_int32_t shouldbe;
+       struct ip_print_demux_state  ipd;

 
 

-       /*
-        * The value that should have gone into the checksum field
-        * is the negative of the value gotten by summing up everything
-        * *but* the checksum field.
-        *
-        * We can compute that by subtracting the value of the checksum
-        * field from the sum of all the data in the packet, and then
-        * computing the negative of that value.
-        *
-        * "sum" is the value of the checksum field, and "computed_sum"
-        * is the negative of the sum of all the data in the packets,
-        * so that's -(-computed_sum - sum), or (sum + computed_sum).
-        *
-        * All the arithmetic in question is one's complement, so the
-        * addition must include an end-around carry; we do this by
-        * doing the arithmetic in 32 bits (with no sign-extension),
-        * and then adding the upper 16 bits of the sum, which contain
-        * the carry, to the lower 16 bits of the sum, and then do it
-        * again in case *that* sum produced a carry.
-        *
-        * As RFC 1071 notes, the checksum can be computed without
-        * byte-swapping the 16-bit words; summing 16-bit words
-        * on a big-endian machine gives a big-endian checksum, which
-        * can be directly stuffed into the big-endian checksum fields
-        * in protocol headers, and summing words on a little-endian
-        * machine gives a little-endian checksum, which must be
-        * byte-swapped before being stuffed into a big-endian checksum
-        * field.
-        *
-        * "computed_sum" is a network-byte-order value, so we must put
-        * it in host byte order before subtracting it from the
-        * host-byte-order value from the header; the adjusted checksum
-        * will be in host byte order, which is what we'll return.
-        */
-       shouldbe = sum;
-       shouldbe += ntohs(computed_sum);
-       shouldbe = (shouldbe & 0xFFFF) + (shouldbe >> 16);
-       shouldbe = (shouldbe & 0xFFFF) + (shouldbe >> 16);
-       return shouldbe;
-}
+       ipd.ip = (const struct ip *)bp2;
+       ipd.cp = bp;
+       ipd.len  = length;
+       ipd.off  = 0;
+       ipd.nh   = nh;
+       ipd.advance = 0;

 
 

-#ifndef IP_MF
-#define IP_MF 0x2000
-#endif /* IP_MF */
-#ifndef IP_DF
-#define IP_DF 0x4000
-#endif /* IP_DF */
-#define IP_RES 0x8000
+       ip_print_demux(ndo, &ipd);
+}

 
 

-static struct tok ip_frag_values[] = {
-        { IP_MF,        "+" },
-        { IP_DF,        "DF" },
-       { IP_RES,       "rsvd" }, /* The RFC3514 evil ;-) bit */
-        { 0,            NULL }
-};

 
 /*
  * print an IP datagram.
  */
 void
 
 /*
  * print an IP datagram.
  */
 void

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

 {
 {

-       register const struct ip *ip;
-       register u_int hlen, len, len0, off;
-       register const u_char *cp;
-       u_char nh;
-       int advance;
+       struct ip_print_demux_state  ipd;
+       struct ip_print_demux_state *ipds=&ipd;
+       const u_char *ipend;
+       u_int hlen;
+       struct cksum_vec vec[1];
+       uint16_t sum, ip_sum;

        struct protoent *proto;
        struct protoent *proto;

-       u_int16_t sum, ip_sum;
-       const char *sep = "";

 
 

-       printf("IP%s ", (((*bp >> 4) & 0xf) == 4) ? "" : "4"); /* print version if != 4 */
+       ipds->ip = (const struct ip *)bp;
+       if (IP_V(ipds->ip) != 4) { /* print version if != 4 */
+           ND_PRINT((ndo, "IP%u ", IP_V(ipds->ip)));
+           if (IP_V(ipds->ip) == 6)
+             ND_PRINT((ndo, ", wrong link-layer encapsulation"));
+       }
+       else if (!ndo->ndo_eflag)
+               ND_PRINT((ndo, "IP "));

 
 

-       ip = (const struct ip *)bp;
-       if ((u_char *)(ip + 1) > snapend) {
-               printf("[|ip]");
+       if ((u_char *)(ipds->ip + 1) > ndo->ndo_snapend) {
+               ND_PRINT((ndo, "%s", tstr));

                return;
        }
        if (length < sizeof (struct ip)) {
                return;
        }
        if (length < sizeof (struct ip)) {

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

                return;
        }
                return;
        }

-       hlen = IP_HL(ip) * 4;
+       hlen = IP_HL(ipds->ip) * 4;

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

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

                return;
        }
 
                return;
        }
 

-       len = EXTRACT_16BITS(&ip->ip_len);
-       if (length < len)
-               (void)printf("truncated-ip - %d bytes missing! ",
-                       len - length);
-       len -= hlen;
-       len0 = len;
+       ipds->len = EXTRACT_16BITS(&ipds->ip->ip_len);
+       if (length < ipds->len)
+               ND_PRINT((ndo, "truncated-ip - %u bytes missing! ",
+                       ipds->len - length));
+       if (ipds->len < hlen) {
+#ifdef GUESS_TSO
+            if (ipds->len) {
+                ND_PRINT((ndo, "bad-len %u", ipds->len));
+                return;
+            }
+            else {
+                /* we guess that it is a TSO send */
+                ipds->len = length;
+            }
+#else
+            ND_PRINT((ndo, "bad-len %u", ipds->len));
+            return;
+#endif /* GUESS_TSO */
+       }

 
 

-       off = EXTRACT_16BITS(&ip->ip_off);
+       /*
+        * Cut off the snapshot length to the end of the IP payload.
+        */
+       ipend = bp + ipds->len;
+       if (ipend < ndo->ndo_snapend)
+               ndo->ndo_snapend = ipend;

 
 

-        if (vflag) {
-            (void)printf("(tos 0x%x", (int)ip->ip_tos);
+       ipds->len -= hlen;
+
+       ipds->off = EXTRACT_16BITS(&ipds->ip->ip_off);
+
+        if (ndo->ndo_vflag) {
+            ND_PRINT((ndo, "(tos 0x%x", (int)ipds->ip->ip_tos));

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

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

                 case 1:
                 case 1:

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

                     break;
                 case 2:
                     break;
                 case 2:

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

                     break;
                 case 3:
                     break;
                 case 3:

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

                 }
             }
 
                 }
             }
 

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

 
            /*
             * for the firewall guys, print id, offset.
 
            /*
             * for the firewall guys, print id, offset.


@@ -420,246 +607,100 @@ ip_print(register const u_char *bp, register u_int length)
             * For unfragmented datagrams, note the don't fragment flag.
             */
 
             * For unfragmented datagrams, note the don't fragment flag.
             */
 

-           (void)printf(", id %u, offset %u, flags [%s]",
-                            EXTRACT_16BITS(&ip->ip_id),
-                            (off & 0x1fff) * 8,
-                            bittok2str(ip_frag_values, "none", off & 0xe000 ));
+           ND_PRINT((ndo, ", id %u, offset %u, flags [%s], proto %s (%u)",
+                         EXTRACT_16BITS(&ipds->ip->ip_id),
+                         (ipds->off & 0x1fff) * 8,
+                         bittok2str(ip_frag_values, "none", ipds->off&0xe000),
+                         tok2str(ipproto_values,"unknown",ipds->ip->ip_p),
+                         ipds->ip->ip_p));

 
 

-            (void)printf(", length: %u", EXTRACT_16BITS(&ip->ip_len));
+            ND_PRINT((ndo, ", length %u", EXTRACT_16BITS(&ipds->ip->ip_len)));

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

-                (void)printf(", optlength: %u (", hlen - (u_int)sizeof(struct ip));
-                ip_optprint((u_char *)(ip + 1), hlen - sizeof(struct ip));
-                printf(" )");
+                ND_PRINT((ndo, ", options ("));
+                ip_optprint(ndo, (u_char *)(ipds->ip + 1), hlen - sizeof(struct ip));
+                ND_PRINT((ndo, ")"));

             }
 
             }
 

-           if ((u_char *)ip + hlen <= snapend) {
-               sum = in_cksum((const u_short *)ip, hlen, 0);
+           if (!ndo->ndo_Kflag && (u_char *)ipds->ip + hlen <= ndo->ndo_snapend) {
+               vec[0].ptr = (const uint8_t *)(void *)ipds->ip;
+               vec[0].len = hlen;
+               sum = in_cksum(vec, 1);

                if (sum != 0) {
                if (sum != 0) {

-                   ip_sum = EXTRACT_16BITS(&ip->ip_sum);
-                   (void)printf("%sbad cksum %x (->%x)!", sep,
-                            ip_sum,
-                            in_cksum_shouldbe(ip_sum, sum));
-                   sep = ", ";
+                   ip_sum = EXTRACT_16BITS(&ipds->ip->ip_sum);
+                   ND_PRINT((ndo, ", bad cksum %x (->%x)!", ip_sum,
+                            in_cksum_shouldbe(ip_sum, sum)));

                }
            }
 
                }
            }
 

-            printf(") ");
+               ND_PRINT((ndo, ")\n    "));

        }
 
        /*
         * If this is fragment zero, hand it to the next higher
         * level protocol.
         */
        }
 
        /*
         * If this is fragment zero, hand it to the next higher
         * level protocol.
         */

-       if ((off & 0x1fff) == 0) {
-               cp = (const u_char *)ip + hlen;
-               nh = ip->ip_p;
-
-#ifndef IPPROTO_SCTP
-#define IPPROTO_SCTP 132
-#endif
-               if (nh != IPPROTO_TCP && nh != IPPROTO_UDP &&
-                   nh != IPPROTO_SCTP) {
-                       (void)printf("%s > %s: ", ipaddr_string(&ip->ip_src),
-                               ipaddr_string(&ip->ip_dst));
-               }
-again:
-               switch (nh) {
-
-#ifndef IPPROTO_AH
-#define IPPROTO_AH     51
-#endif
-               case IPPROTO_AH:
-                       nh = *cp;
-                       advance = ah_print(cp);
-                       cp += advance;
-                       len -= advance;
-                       goto again;
-
-#ifndef IPPROTO_ESP
-#define IPPROTO_ESP    50
-#endif
-               case IPPROTO_ESP:
-                   {
-                       int enh, padlen;
-                       advance = esp_print(cp, (const u_char *)ip, &enh, &padlen);
-                       cp += advance;
-                       len -= advance + padlen;
-                       if (enh < 0)
-                               break;
-                       nh = enh & 0xff;
-                       goto again;
-                   }
-
-#ifndef IPPROTO_IPCOMP
-#define IPPROTO_IPCOMP 108
-#endif
-               case IPPROTO_IPCOMP:
-                   {
-                       int enh;
-                       advance = ipcomp_print(cp, &enh);
-                       cp += advance;
-                       len -= advance;
-                       if (enh < 0)
-                               break;
-                       nh = enh & 0xff;
-                       goto again;
-                   }
-
-               case IPPROTO_SCTP:
-                       sctp_print(cp, (const u_char *)ip, len);
-                       break;
-
-               case IPPROTO_TCP:
-                       tcp_print(cp, len, (const u_char *)ip, (off &~ 0x6000));
-                       break;
-
-               case IPPROTO_UDP:
-                       udp_print(cp, len, (const u_char *)ip, (off &~ 0x6000));
-                       break;
-
-               case IPPROTO_ICMP:
-                       /* pass on the MF bit plus the offset to detect fragments */
-                       icmp_print(cp, len, (const u_char *)ip, (off & 0x3fff));
-                       break;
-
-#ifndef IPPROTO_IGRP
-#define IPPROTO_IGRP 9
-#endif
-               case IPPROTO_IGRP:
-                       igrp_print(cp, len, (const u_char *)ip);
-                       break;
-
-               case IPPROTO_ND:
-                       (void)printf(" nd %d", len);
-                       break;
-
-               case IPPROTO_EGP:
-                       egp_print(cp);
-                       break;
-
-#ifndef IPPROTO_OSPF
-#define IPPROTO_OSPF 89
-#endif
-               case IPPROTO_OSPF:
-                       ospf_print(cp, len, (const u_char *)ip);
-                       break;
-
-#ifndef IPPROTO_IGMP
-#define IPPROTO_IGMP 2
-#endif
-               case IPPROTO_IGMP:
-                       igmp_print(cp, len);
-                       break;
-
-               case 4:
-                       /* DVMRP multicast tunnel (ip-in-ip encapsulation) */
-                       ip_print(cp, len);
-                       if (! vflag) {
-                               printf(" (ipip-proto-4)");
-                               return;
-                       }
-                       break;
-
-#ifdef INET6
-#ifndef IP6PROTO_ENCAP
-#define IP6PROTO_ENCAP 41
-#endif
-               case IP6PROTO_ENCAP:
-                       /* ip6-in-ip encapsulation */
-                       ip6_print(cp, len);
-                       break;
-#endif /*INET6*/
-
-#ifndef IPPROTO_RSVP
-#define IPPROTO_RSVP 46
-#endif
-               case IPPROTO_RSVP:
-                       rsvp_print(cp, len);
-                       break;
-
-#ifndef IPPROTO_GRE
-#define IPPROTO_GRE 47
-#endif
-               case IPPROTO_GRE:
-                       /* do it */
-                       gre_print(cp, len);
-                       break;
-
-#ifndef IPPROTO_MOBILE
-#define IPPROTO_MOBILE 55
-#endif
-               case IPPROTO_MOBILE:
-                       mobile_print(cp, len);
-                       break;
-
-#ifndef IPPROTO_PIM
-#define IPPROTO_PIM    103
-#endif
-               case IPPROTO_PIM:
-                       pim_print(cp, len);
-                       break;
-
-#ifndef IPPROTO_VRRP
-#define IPPROTO_VRRP   112
-#endif
-               case IPPROTO_VRRP:
-                       vrrp_print(cp, len, ip->ip_ttl);
-                       break;
-
-               default:
-                       if ((proto = getprotobynumber(nh)) != NULL)
-                               (void)printf(" %s", proto->p_name);
-                       else
-                               (void)printf(" ip-proto-%d", nh);
-                       printf(" %d", len);
-                       break;
+       if ((ipds->off & 0x1fff) == 0) {
+               ipds->cp = (const u_char *)ipds->ip + hlen;
+               ipds->nh = ipds->ip->ip_p;
+
+               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)));

                }
                }

+               ip_print_demux(ndo, ipds);

        } else {
            /* Ultra quiet now means that all this stuff should be suppressed */
        } else {
            /* Ultra quiet now means that all this stuff should be suppressed */

-           if (qflag > 1) return;
+           if (ndo->ndo_qflag > 1) return;

 
            /*
             * if this isn't the first frag, we're missing the
             * next level protocol header.  print the ip addr
             * and the protocol.
             */
 
            /*
             * if this isn't the first frag, we're missing the
             * next level protocol header.  print the ip addr
             * and the protocol.
             */

-           if (off & 0x1fff) {
-               (void)printf("%s > %s:", ipaddr_string(&ip->ip_src),
-                            ipaddr_string(&ip->ip_dst));
-               if ((proto = getprotobynumber(ip->ip_p)) != NULL)
-                   (void)printf(" %s", proto->p_name);
-               else
-                   (void)printf(" ip-proto-%d", ip->ip_p);
-           } 
+               if (ipds->off & 0x1fff) {
+                       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
+                               ND_PRINT((ndo, " ip-proto-%d", ipds->ip->ip_p));
+               }

        }
 }
 
 void
        }
 }
 
 void

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

 {
 {

-       struct ip *ip, hdr;
+       struct ip hdr;

 
 

-       ip = (struct ip *)bp;

        if (length < 4) {
        if (length < 4) {

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

                return;
        }
                return;
        }

-       memcpy (&hdr, (char *)ip, 4);
+       memcpy (&hdr, bp, 4);

        switch (IP_V(&hdr)) {
        case 4:
        switch (IP_V(&hdr)) {
        case 4:

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

                return;
 #ifdef INET6
        case 6:
                return;
 #ifdef INET6
        case 6:

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

                return;
 #endif
        default:
                return;
 #endif
        default:

-               (void)printf("unknown ip %d", IP_V(&hdr));
+               ND_PRINT((ndo, "unknown ip %d", IP_V(&hdr)));

                return;
        }
 }
 
                return;
        }
 }
 

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