]> The Tcpdump Group git mirrors - tcpdump/blobdiff - print-ip.c
projects / tcpdump / blobdiff
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
Add changes in 4.2.1.
[tcpdump] / print-ip.c
diff --git a/print-ip.c b/print-ip.c
index c1c1fda7a966bab4ca91d78972976d1ddb0f3755..1fa7aab0d6cae8830aa92c9f8ac3cf37dfb9d01a 100644 (file)
--- a/print-ip.c
+++ b/print-ip.c
@@ -21,7 +21,7 @@
 
 #ifndef lint
 static const char rcsid[] _U_ =
 
 #ifndef lint
 static const char rcsid[] _U_ =
-    "@(#) $Header: /tcpdump/master/tcpdump/print-ip.c,v 1.140 2004-05-01 10:15:33 hannes Exp $ (LBL)";
+    "@(#) $Header: /tcpdump/master/tcpdump/print-ip.c,v 1.159 2007-09-14 01:29:28 guy Exp $ (LBL)";
 #endif
 
 #ifdef HAVE_CONFIG_H
 #endif
 
 #ifdef HAVE_CONFIG_H
@@ -41,11 +41,24 @@ static const char rcsid[] _U_ =
 #include "ip.h"
 #include "ipproto.h"
 
 #include "ip.h"
 #include "ipproto.h"
 
+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(register const u_char *cp, u_int length)
 {
        register u_int ptr;
        register u_int len;
 {
        register u_int ptr;
        register u_int len;
@@ -54,31 +67,27 @@ ip_printroute(const char *type, register const u_char *cp, u_int length)
                printf(" [bad length %u]", length);
                return;
        }
                printf(" [bad length %u]", length);
                return;
        }
-       printf(" %s{", type);
        if ((length + 1) & 3)
                printf(" [bad length %u]", length);
        ptr = cp[2] - 1;
        if (ptr < 3 || ((ptr + 1) & 3) || ptr > length + 1)
                printf(" [bad ptr %u]", cp[2]);
 
        if ((length + 1) & 3)
                printf(" [bad length %u]", length);
        ptr = cp[2] - 1;
        if (ptr < 3 || ((ptr + 1) & 3) || ptr > length + 1)
                printf(" [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 = " ";
+               printf(" %s", ipaddr_string(&cp[len]));
+                if (ptr > len)
+                        printf(",");
        }
        }
-       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
+static u_int32_t
 ip_finddst(const struct ip *ip)
 {
        int length;
 ip_finddst(const struct ip *ip)
 {
        int length;
@@ -94,14 +103,15 @@ ip_finddst(const struct ip *ip)
 
                TCHECK(*cp);
                tt = *cp;
 
                TCHECK(*cp);
                tt = *cp;
-               if (tt == IPOPT_NOP || tt == IPOPT_EOL)
+               if (tt == IPOPT_EOL)
+                       break;
+               else if (tt == IPOPT_NOP)
                        len = 1;
                else {
                        TCHECK(cp[1]);
                        len = cp[1];
                        len = 1;
                else {
                        TCHECK(cp[1]);
                        len = cp[1];
-               }
-               if (len < 2) {
-                       return 0;
+                       if (len < 2)
+                               break;
                }
                TCHECK2(*cp, len);
                switch (tt) {
                }
                TCHECK2(*cp, len);
                switch (tt) {
@@ -109,15 +119,47 @@ ip_finddst(const struct ip *ip)
                case IPOPT_SSRR:
                case IPOPT_LSRR:
                        if (len < 7)
                case IPOPT_SSRR:
                case IPOPT_LSRR:
                        if (len < 7)
-                               return 0;
+                               break;
                        memcpy(&retval, cp + len - 4, 4);
                        return retval;
                }
        }
                        memcpy(&retval, cp + len - 4, 4);
                        return retval;
                }
        }
-       return ip->ip_dst.s_addr;
-
 trunc:
 trunc:
-       return 0;
+       memcpy(&retval, &ip->ip_dst.s_addr, sizeof(u_int32_t));
+       return retval;
+}
+
+/*
+ * Compute a V4-style checksum by building a pseudoheader.
+ */
+int
+nextproto4_cksum(const struct ip *ip, const u_int8_t *data,
+                u_int len, u_int next_proto)
+{
+       struct phdr {
+               u_int32_t src;
+               u_int32_t dst;
+               u_char mbz;
+               u_char proto;
+               u_int16_t len;
+       } ph;
+       struct cksum_vec vec[2];
+
+       /* pseudo-header.. */
+       ph.len = htons((u_int16_t)len);
+       ph.mbz = 0;
+       ph.proto = next_proto;
+       memcpy(&ph.src, &ip->ip_src.s_addr, sizeof(u_int32_t));
+       if (IP_HL(ip) == 5)
+               memcpy(&ph.dst, &ip->ip_dst.s_addr, sizeof(u_int32_t));
+       else
+               ph.dst = ip_finddst(ip);
+
+       vec[0].ptr = (const u_int8_t *)(void *)&ph;
+       vec[0].len = sizeof(ph);
+       vec[1].ptr = data;
+       vec[1].len = len;
+       return (in_cksum(vec, 2));
 }
 
 static void
 }
 
 static void
@@ -129,17 +171,17 @@ ip_printts(register const u_char *cp, u_int length)
        const char *type;
 
        if (length < 4) {
        const char *type;
 
        if (length < 4) {
-               printf("[bad length %d]", length);
+               printf("[bad length %u]", length);
                return;
        }
        printf(" TS{");
        hoplen = ((cp[3]&0xF) != IPOPT_TS_TSONLY) ? 8 : 4;
        if ((length - 4) & (hoplen-1))
                return;
        }
        printf(" TS{");
        hoplen = ((cp[3]&0xF) != IPOPT_TS_TSONLY) ? 8 : 4;
        if ((length - 4) & (hoplen-1))
-               printf("[bad length %d]", length);
+               printf("[bad length %u]", length);
        ptr = cp[2] - 1;
        len = 0;
        if (ptr < 4 || ((ptr - 4) & (hoplen-1)) || ptr > length + 1)
        ptr = cp[2] - 1;
        len = 0;
        if (ptr < 4 || ((ptr - 4) & (hoplen-1)) || ptr > length + 1)
-               printf("[bad ptr %d]", cp[2]);
+               printf("[bad ptr %u]", cp[2]);
        switch (cp[3]&0xF) {
        case IPOPT_TS_TSONLY:
                printf("TSONLY");
        switch (cp[3]&0xF) {
        case IPOPT_TS_TSONLY:
                printf("TSONLY");
@@ -188,75 +230,68 @@ done:
 static void
 ip_optprint(register const u_char *cp, u_int length)
 {
 static void
 ip_optprint(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;
+       for (; length > 0; cp += option_len, length -= option_len) {
+               u_int option_code;
+
+               printf("%s", sep);
+               sep = ",";
 
                TCHECK(*cp);
 
                TCHECK(*cp);
-               tt = *cp;
-               if (tt == IPOPT_NOP || tt == IPOPT_EOL)
-                       len = 1;
+               option_code = *cp;
+
+                printf("%s",
+                        tok2str(ip_option_values,"unknown %u",option_code));
+
+               if (option_code == IPOPT_NOP ||
+                    option_code == IPOPT_EOL)
+                       option_len = 1;
+
                else {
                        TCHECK(cp[1]);
                else {
                        TCHECK(cp[1]);
-                       len = cp[1];
-                       if (len < 2) {
-                               printf("[|ip op len %d]", len);
+                       option_len = cp[1];
+                       if (option_len < 2) {
+                               printf(" [bad length %u]", option_len);
                                return;
                        }
                                return;
                        }
-                       TCHECK2(*cp, len);
                }
                }
-               switch (tt) {
 
 
-               case IPOPT_EOL:
-                       printf(" EOL");
-                       if (length > 1)
-                               printf("-%d", length - 1);
+               if (option_len > length) {
+                       printf(" [bad length %u]", option_len);
                        return;
                        return;
+               }
 
 
-               case IPOPT_NOP:
-                       printf(" NOP");
-                       break;
-
-               case IPOPT_TS:
-                       ip_printts(cp, len);
-                       break;
+                TCHECK2(*cp, option_len);
 
 
-#ifndef IPOPT_SECURITY
-#define IPOPT_SECURITY 130
-#endif /* IPOPT_SECURITY */
-               case IPOPT_SECURITY:
-                       printf(" SECURITY{%d}", len);
-                       break;
+               switch (option_code) {
+               case IPOPT_EOL:
+                       return;
 
 
-               case IPOPT_RR:
-                       ip_printroute("RR", cp, len);
+               case IPOPT_TS:
+                       ip_printts(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(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 {
-                               TCHECK(cp[3]);
-                               if (cp[2] || cp[3])
-                                       printf("%d.%d", cp[2], cp[3]);
+                       if (option_len < 4) {
+                               printf(" [bad length %u]", option_len);
+                               break;
                        }
                        }
+                        TCHECK(cp[3]);
+                        if (EXTRACT_16BITS(&cp[2]) != 0)
+                            printf(" 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;
                }
        }
@@ -266,171 +301,290 @@ trunc:
        printf("[|ip]");
 }
 
        printf("[|ip]");
 }
 
-/*
- * 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 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(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;
+       }
+       
+       case IPPROTO_IPCOMP:
+       {
+               int enh;
+               ipds->advance = ipcomp_print(ipds->cp, &enh);
+               if (ipds->advance <= 0)
+                       break;
+               ipds->cp += ipds->advance;
+               ipds->len -= ipds->advance;
+               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_SCTP:
+               sctp_print(ipds->cp, (const u_char *)ipds->ip, 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)
-{
-       u_int32_t shouldbe;
+       case IPPROTO_DCCP:
+               dccp_print(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(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(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(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(ipds->cp, ipds->len, (const u_char *)ipds->ip);
+               break;
+               
+       case IPPROTO_EIGRP:
+               eigrp_print(ipds->cp, ipds->len);
+               break;
+               
+       case IPPROTO_ND:
+               ND_PRINT((ndo, " nd %d", ipds->len));
+               break;
 
 
-       /*
-        * 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;
+       case IPPROTO_EGP:
+               egp_print(ipds->cp, ipds->len);
+               break;
+
+       case IPPROTO_OSPF:
+               ospf_print(ipds->cp, ipds->len, (const u_char *)ipds->ip);
+               break;
+
+       case IPPROTO_IGMP:
+               igmp_print(ipds->cp, ipds->len);
+               break;
+
+       case IPPROTO_IPV4:
+               /* DVMRP multicast tunnel (ip-in-ip encapsulation) */
+               ip_print(ndo, ipds->cp, ipds->len);
+               if (! 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(ipds->cp, ipds->len);
+               break;
+
+       case IPPROTO_GRE:
+               /* do it */
+               gre_print(ipds->cp, ipds->len);
+               break;
+
+       case IPPROTO_MOBILE:
+               mobile_print(ipds->cp, ipds->len);
+               break;
+
+       case IPPROTO_PIM:
+               vec[0].ptr = ipds->cp;
+               vec[0].len = ipds->len;
+               pim_print(ipds->cp, ipds->len, in_cksum(vec, 1));
+               break;
+
+       case IPPROTO_VRRP:
+               if (packettype == PT_CARP) {
+                       if (vflag)
+                               (void)printf("carp %s > %s: ",
+                                            ipaddr_string(&ipds->ip->ip_src),
+                                            ipaddr_string(&ipds->ip->ip_dst));
+                       carp_print(ipds->cp, ipds->len, ipds->ip->ip_ttl);
+               } else {
+                       if (vflag)
+                               (void)printf("vrrp %s > %s: ",
+                                            ipaddr_string(&ipds->ip->ip_src),
+                                            ipaddr_string(&ipds->ip->ip_dst));
+                       vrrp_print(ipds->cp, ipds->len, ipds->ip->ip_ttl);
+               }
+               break;
+
+       case IPPROTO_PGM:
+               pgm_print(ipds->cp, ipds->len, (const u_char *)ipds->ip);
+               break;
+
+       default:
+               if ((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;
+       }
 }
 }
+              
+void
+ip_print_inner(netdissect_options *ndo,
+              const u_char *bp,
+              u_int length, u_int nh,
+              const u_char *bp2)
+{
+       struct ip_print_demux_state  ipd;
 
 
-#ifndef IP_MF
-#define IP_MF 0x2000
-#endif /* IP_MF */
-#ifndef IP_DF
-#define IP_DF 0x4000
-#endif /* IP_DF */
-#define IP_RES 0x8000
+       ipd.ip = (const struct ip *)bp2;
+       ipd.cp = bp;
+       ipd.len  = length;
+       ipd.off  = 0;
+       ipd.nh   = nh;
+       ipd.advance = 0;
+
+       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;
+       struct ip_print_demux_state  ipd;
+       struct ip_print_demux_state *ipds=&ipd;
        const u_char *ipend;
        const u_char *ipend;
-       register const u_char *cp;
-       u_char nh;
-       int advance;
-       struct protoent *proto;
+       u_int hlen;
+       struct cksum_vec vec[1];
        u_int16_t sum, ip_sum;
        u_int16_t sum, ip_sum;
+       struct protoent *proto;
 
 
-       ip = (const struct ip *)bp;
-       if (IP_V(ip) != 4) { /* print version if != 4 */
-           printf("IP%u ", IP_V(ip));
-           if (IP_V(ip) == 6)
+       ipds->ip = (const struct ip *)bp;
+       if (IP_V(ipds->ip) != 4) { /* print version if != 4 */
+           printf("IP%u ", IP_V(ipds->ip));
+           if (IP_V(ipds->ip) == 6)
                printf(", wrong link-layer encapsulation");
        }
         else if (!eflag)
            printf("IP ");
 
                printf(", wrong link-layer encapsulation");
        }
         else if (!eflag)
            printf("IP ");
 
-       if ((u_char *)(ip + 1) > snapend) {
+       if ((u_char *)(ipds->ip + 1) > ndo->ndo_snapend) {
                printf("[|ip]");
                return;
        }
        if (length < sizeof (struct ip)) {
                printf("[|ip]");
                return;
        }
        if (length < sizeof (struct ip)) {
-               (void)printf("truncated-ip %d", length);
+               (void)printf("truncated-ip %u", length);
                return;
        }
                return;
        }
-       hlen = IP_HL(ip) * 4;
+       hlen = IP_HL(ipds->ip) * 4;
        if (hlen < sizeof (struct ip)) {
                (void)printf("bad-hlen %u", hlen);
                return;
        }
 
        if (hlen < sizeof (struct ip)) {
                (void)printf("bad-hlen %u", hlen);
                return;
        }
 
-       len = EXTRACT_16BITS(&ip->ip_len);
-       if (length < len)
+       ipds->len = EXTRACT_16BITS(&ipds->ip->ip_len);
+       if (length < ipds->len)
                (void)printf("truncated-ip - %u bytes missing! ",
                (void)printf("truncated-ip - %u bytes missing! ",
-                       len - length);
-       if (len < hlen) {
-               (void)printf("bad-len %u", len);
-               return;
+                       ipds->len - length);
+       if (ipds->len < hlen) {
+#ifdef GUESS_TSO
+            if (ipds->len) {
+                (void)printf("bad-len %u", ipds->len);
+                return;
+            }
+            else {
+                /* we guess that it is a TSO send */
+                ipds->len = length;
+            }
+#else
+            (void)printf("bad-len %u", ipds->len);
+            return;
+#endif /* GUESS_TSO */
        }
 
        /*
         * Cut off the snapshot length to the end of the IP payload.
         */
        }
 
        /*
         * Cut off the snapshot length to the end of the IP payload.
         */
-       ipend = bp + len;
-       if (ipend < snapend)
-               snapend = ipend;
+       ipend = bp + ipds->len;
+       if (ipend < ndo->ndo_snapend)
+               ndo->ndo_snapend = ipend;
 
 
-       len -= hlen;
-       len0 = len;
+       ipds->len -= hlen;
 
 
-       off = EXTRACT_16BITS(&ip->ip_off);
+       ipds->off = EXTRACT_16BITS(&ipds->ip->ip_off);
 
         if (vflag) {
 
         if (vflag) {
-            (void)printf("(tos 0x%x", (int)ip->ip_tos);
+            (void)printf("(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:
                     (void)printf(",ECT(1)");
                     break;
                 case 1:
                     (void)printf(",ECT(1)");
                     break;
@@ -442,8 +596,8 @@ ip_print(register const u_char *bp, register u_int length)
                 }
             }
 
                 }
             }
 
-            if (ip->ip_ttl >= 1)
-                (void)printf(", ttl %3u", ip->ip_ttl);    
+            if (ipds->ip->ip_ttl >= 1)
+                (void)printf(", ttl %u", ipds->ip->ip_ttl);    
 
            /*
             * for the firewall guys, print id, offset.
 
            /*
             * for the firewall guys, print id, offset.
@@ -451,181 +605,50 @@ 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], proto: %s (%u)",
-                         EXTRACT_16BITS(&ip->ip_id),
-                         (off & 0x1fff) * 8,
-                         bittok2str(ip_frag_values, "none", off & 0xe000 ),
-                         tok2str(ipproto_values,"unknown",ip->ip_p),
-                         ip->ip_p);
+           (void)printf(", 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));
+            (void)printf(", 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(" )");
+                printf(", options (");
+                ip_optprint((u_char *)(ipds->ip + 1), hlen - sizeof(struct ip));
+                printf(")");
             }
 
             }
 
-           if ((u_char *)ip + hlen <= snapend) {
-               sum = in_cksum((const u_short *)ip, hlen, 0);
+           if (!Kflag && (u_char *)ipds->ip + hlen <= ndo->ndo_snapend) {
+               vec[0].ptr = (const u_int8_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);
+                   ip_sum = EXTRACT_16BITS(&ipds->ip->ip_sum);
                    (void)printf(", bad cksum %x (->%x)!", ip_sum,
                             in_cksum_shouldbe(ip_sum, sum));
                }
            }
 
                    (void)printf(", bad cksum %x (->%x)!", ip_sum,
                             in_cksum_shouldbe(ip_sum, sum));
                }
            }
 
-            printf(") ");
+            printf(")\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;
-
-               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) {
-
-               case IPPROTO_AH:
-                       nh = *cp;
-                       advance = ah_print(cp);
-                       if (advance <= 0)
-                               break;
-                       cp += advance;
-                       len -= advance;
-                       goto again;
-
-               case IPPROTO_ESP:
-                   {
-                       int enh, padlen;
-                       advance = esp_print(gndo, cp, (const u_char *)ip, &enh, &padlen);
-                       if (advance <= 0)
-                               break;
-                       cp += advance;
-                       len -= advance + padlen;
-                       nh = enh & 0xff;
-                       goto again;
-                   }
-
-               case IPPROTO_IPCOMP:
-                   {
-                       int enh;
-                       advance = ipcomp_print(cp, &enh);
-                       if (advance <= 0)
-                               break;
-                       cp += advance;
-                       len -= advance;
-                       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;
-
-               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(cp, len, (const u_char *)ip);
-                       break;
-
-               case IPPROTO_EIGRP:
-                       eigrp_print(cp, len);
-                       break;
-
-               case IPPROTO_ND:
-                       (void)printf(" nd %d", len);
-                       break;
-
-               case IPPROTO_EGP:
-                       egp_print(cp);
-                       break;
-
-               case IPPROTO_OSPF:
-                       ospf_print(cp, len, (const u_char *)ip);
-                       break;
-
-               case IPPROTO_IGMP:
-                       igmp_print(cp, len);
-                       break;
-
-               case IPPROTO_IPV4:
-                       /* DVMRP multicast tunnel (ip-in-ip encapsulation) */
-                       ip_print(cp, len);
-                       if (! vflag) {
-                               printf(" (ipip-proto-4)");
-                               return;
-                       }
-                       break;
-
-#ifdef INET6
-               case IPPROTO_IPV6:
-                       /* ip6-in-ip encapsulation */
-                       ip6_print(cp, len);
-                       break;
-#endif /*INET6*/
-
-               case IPPROTO_RSVP:
-                       rsvp_print(cp, len);
-                       break;
-
-               case IPPROTO_GRE:
-                       /* do it */
-                       gre_print(cp, len);
-                       break;
-
-               case IPPROTO_MOBILE:
-                       mobile_print(cp, len);
-                       break;
-
-               case IPPROTO_PIM:
-                       pim_print(cp, len);
-                       break;
-
-               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) {
+                       (void)printf("%s > %s: ",
+                                    ipaddr_string(&ipds->ip->ip_src),
+                                    ipaddr_string(&ipds->ip->ip_dst));
                }
                }
+               ip_print_demux(ndo, ipds);
        } else {
            /* Ultra quiet now means that all this stuff should be suppressed */
            if (qflag > 1) return;
        } else {
            /* Ultra quiet now means that all this stuff should be suppressed */
            if (qflag > 1) return;
@@ -635,13 +658,13 @@ again:
             * next level protocol header.  print the ip addr
             * and the protocol.
             */
             * 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)
+           if (ipds->off & 0x1fff) {
+               (void)printf("%s > %s:", ipaddr_string(&ipds->ip->ip_src),
+                            ipaddr_string(&ipds->ip->ip_dst));
+               if ((proto = getprotobynumber(ipds->ip->ip_p)) != NULL)
                    (void)printf(" %s", proto->p_name);
                else
                    (void)printf(" %s", proto->p_name);
                else
-                   (void)printf(" ip-proto-%d", ip->ip_p);
+                   (void)printf(" ip-proto-%d", ipds->ip->ip_p);
            } 
        }
 }
            } 
        }
 }
@@ -659,11 +682,11 @@ ipN_print(register const u_char *bp, register u_int length)
        memcpy (&hdr, (char *)ip, 4);
        switch (IP_V(&hdr)) {
        case 4:
        memcpy (&hdr, (char *)ip, 4);
        switch (IP_V(&hdr)) {
        case 4:
-               ip_print (bp, length);
+               ip_print (gndo, bp, length);
                return;
 #ifdef INET6
        case 6:
                return;
 #ifdef INET6
        case 6:
-               ip6_print (bp, length);
+               ip6_print (gndo, bp, length);
                return;
 #endif
        default:
                return;
 #endif
        default:
@@ -672,5 +695,11 @@ ipN_print(register const u_char *bp, register u_int length)
        }
 }
 
        }
 }
 
+/*
+ * Local Variables:
+ * c-style: whitesmith
+ * c-basic-offset: 8
+ * End:
+ */
 
 
 
 
[mirror] the TCPdump network dissector