Fix the parenthesization in the "alignment required but you can

[tcpdump] / print-ip.c

diff --git a/print-ip.c b/print-ip.c
index 9357abac74945594d2c50dad4be2186d069752d3..8d41e287a72ec99cf83409bdd4e21f44cc9444bf 100644 (file)
--- a/print-ip.c
+++ b/print-ip.c
@@ -21,7 +21,7 @@
 
 #ifndef lint
 static const char rcsid[] _U_ =
-    "@(#) $Header: /tcpdump/master/tcpdump/print-ip.c,v 1.134 2004-03-24 01:26:56 guy Exp $ (LBL)";
+    "@(#) $Header: /tcpdump/master/tcpdump/print-ip.c,v 1.143 2004-08-27 03:57:40 guy Exp $ (LBL)";
 #endif
 
 #ifdef HAVE_CONFIG_H
@@ -72,7 +72,7 @@ ip_printroute(const char *type, register const u_char *cp, u_int length)
 }
 
 /*
- * 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
@@ -94,14 +94,15 @@ ip_finddst(const struct ip *ip)
 
                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];
-               }
-               if (len < 2) {
-                       return 0;
+                       if (len < 2)
+                               break;
                }
                TCHECK2(*cp, len);
                switch (tt) {
@@ -109,15 +110,14 @@ ip_finddst(const struct ip *ip)
                case IPOPT_SSRR:
                case IPOPT_LSRR:
                        if (len < 7)
-                               return 0;
+                               break;
                        memcpy(&retval, cp + len - 4, 4);
                        return retval;
                }
        }
-       return ip->ip_dst.s_addr;
-
 trunc:
-       return 0;
+       memcpy(&retval, &ip->ip_dst.s_addr, sizeof(u_int32_t));
+       return retval;
 }
 
 static void
@@ -200,12 +200,12 @@ ip_optprint(register const u_char *cp, u_int length)
                else {
                        TCHECK(cp[1]);
                        len = cp[1];
+                       if (len < 2) {
+                               printf("[|ip op len %d]", len);
+                               return;
+                       }
+                       TCHECK2(*cp, len);
                }
-               if (len < 2) {
-                       printf("[|ip op len %d]", len);
-                       return;
-               }
-               TCHECK2(*cp, len);
                switch (tt) {
 
                case IPOPT_EOL:
@@ -388,7 +388,7 @@ ip_print(register const u_char *bp, register u_int length)
            if (IP_V(ip) == 6)
                printf(", wrong link-layer encapsulation");
        }
-        else
+        else if (!eflag)
            printf("IP ");
 
        if ((u_char *)(ip + 1) > snapend) {
@@ -396,7 +396,7 @@ ip_print(register const u_char *bp, register u_int length)
                return;
        }
        if (length < sizeof (struct ip)) {
-               (void)printf("truncated-ip %d", length);
+               (void)printf("truncated-ip %u", length);
                return;
        }
        hlen = IP_HL(ip) * 4;
@@ -451,11 +451,12 @@ ip_print(register const u_char *bp, register u_int length)
             * For unfragmented datagrams, note the don't fragment flag.
             */
 
-           (void)printf(", id %u, offset %u, flags [%s], proto %u",
-                            EXTRACT_16BITS(&ip->ip_id),
-                            (off & 0x1fff) * 8,
-                            bittok2str(ip_frag_values, "none", off & 0xe000 ),
-                             ip->ip_p);
+           (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(", length: %u", EXTRACT_16BITS(&ip->ip_len));
 
@@ -505,7 +506,7 @@ again:
                case IPPROTO_ESP:
                    {
                        int enh, padlen;
-                       advance = esp_print(cp, (const u_char *)ip, &enh, &padlen);
+                       advance = esp_print(gndo, cp, len, (const u_char *)ip, &enh, &padlen);
                        if (advance <= 0)
                                break;
                        cp += advance;
@@ -543,10 +544,27 @@ again:
                        icmp_print(cp, len, (const u_char *)ip, (off & 0x3fff));
                        break;
 
-               case IPPROTO_IGRP:
+               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;