Squelch some alignment warnings.

[tcpdump] / print-ip.c

diff --git a/print-ip.c b/print-ip.c
index e64cd5f1d818054414914059eb2f27e3a5d64581..bb1554f9d133479e8381494b1a4c379acd4e1b6a 100644 (file)
--- a/print-ip.c
+++ b/print-ip.c
@@ -330,6 +330,10 @@ again:
        switch (ipds->nh) {
 
        case IPPROTO_AH:
+               if (!ND_TTEST(*ipds->cp)) {
+                       ND_PRINT((ndo, "[|AH]"));
+                       break;
+               }
                ipds->nh = *ipds->cp;
                ipds->advance = ah_print(ndo, ipds->cp);
                if (ipds->advance <= 0)
@@ -354,14 +358,14 @@ again:
 
        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;
+               ipcomp_print(ndo, ipds->cp);
+               /*
+                * Either this has decompressed the payload and
+                * printed it, in which case there's nothing more
+                * to do, or it hasn't, in which case there's
+                * nothing more to do.
+                */
+               break;
        }
 
        case IPPROTO_SCTP:
@@ -526,13 +530,14 @@ ip_print(netdissect_options *ndo,
 
        ipds->ip = (const struct ip *)bp;
        ND_TCHECK(ipds->ip->ip_vhl);
-       if (IP_V(ipds->ip) != 4) { /* print version if != 4 */
+       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 "));
            else
              ND_PRINT((ndo, "IP%u ", IP_V(ipds->ip)));
+           return;
        }
-       else if (!ndo->ndo_eflag)
+       if (!ndo->ndo_eflag)
                ND_PRINT((ndo, "IP "));
 
        ND_TCHECK(*ipds->ip);
@@ -580,17 +585,22 @@ ip_print(netdissect_options *ndo,
         if (ndo->ndo_vflag) {
             ND_PRINT((ndo, "(tos 0x%x", (int)ipds->ip->ip_tos));
             /* ECN bits */
-            if (ipds->ip->ip_tos & 0x03) {
-                switch (ipds->ip->ip_tos & 0x03) {
-                case 1:
-                    ND_PRINT((ndo, ",ECT(1)"));
-                    break;
-                case 2:
-                    ND_PRINT((ndo, ",ECT(0)"));
-                    break;
-                case 3:
-                    ND_PRINT((ndo, ",CE"));
-                }
+            switch (ipds->ip->ip_tos & 0x03) {
+
+            case 0:
+                break;
+
+            case 1:
+                ND_PRINT((ndo, ",ECT(1)"));
+                break;
+
+            case 2:
+                ND_PRINT((ndo, ",ECT(0)"));
+                break;
+
+            case 3:
+                ND_PRINT((ndo, ",CE"));
+                break;
             }
 
             if (ipds->ip->ip_ttl >= 1)
@@ -647,22 +657,24 @@ ip_print(netdissect_options *ndo,
                }
                ip_print_demux(ndo, ipds);
        } else {
-           /* Ultra quiet now means that all this stuff should be suppressed */
-           if (ndo->ndo_qflag > 1) return;
+               /*
+                * Ultra quiet now means that all this stuff should be
+                * suppressed.
+                */
+               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 (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));
-               }
+               /*
+                * This isn't the first frag, so we're missing the
+                * 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 && (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));
        }
        return;
 
@@ -674,24 +686,28 @@ trunc:
 void
 ipN_print(netdissect_options *ndo, register const u_char *bp, register u_int length)
 {
-       struct ip hdr;
-
-       if (length < 4) {
+       if (length < 1) {
                ND_PRINT((ndo, "truncated-ip %d", length));
                return;
        }
-       memcpy (&hdr, bp, 4);
-       switch (IP_V(&hdr)) {
-       case 4:
+
+       ND_TCHECK(*bp);
+       switch (*bp & 0xF0) {
+       case 0x40:
                ip_print (ndo, bp, length);
-               return;
-       case 6:
+               break;
+       case 0x60:
                ip6_print (ndo, bp, length);
-               return;
+               break;
        default:
-               ND_PRINT((ndo, "unknown ip %d", IP_V(&hdr)));
-               return;
+               ND_PRINT((ndo, "unknown ip %d", (*bp & 0xF0) >> 4));
+               break;
        }
+       return;
+
+trunc:
+       ND_PRINT((ndo, "%s", tstr));
+       return;
 }
 
 /*