Use more the EXTRACT_8BITS() macro to fetch a one-byte value (17/n)

[tcpdump] / print-ip.c

diff --git a/print-ip.c b/print-ip.c
index f8e02c1e79c85c92e70b058a6422dc2e912060a5..519cd793d30464839c07f3d93dbf2be9a2c20153 100644 (file)
--- a/print-ip.c
+++ b/print-ip.c
@@ -220,8 +220,8 @@ ip_printts(netdissect_options *ndo,
                if (ptr == len)
                        type = " ^ ";
                ND_TCHECK2(cp[len], hoplen);
-               ND_PRINT((ndo, "%s%d@%s", type, EXTRACT_32BITS(&cp[len+hoplen-4]),
-                      hoplen!=8 ? "" : ipaddr_string(ndo, &cp[len])));
+               ND_PRINT((ndo, "%s%d@%s", type, EXTRACT_BE_32BITS(cp + len + hoplen - 4),
+                         hoplen!=8 ? "" : ipaddr_string(ndo, &cp[len])));
                type = " ";
        }
 
@@ -302,8 +302,8 @@ ip_optprint(netdissect_options *ndo,
                                break;
                        }
                        ND_TCHECK(cp[3]);
-                       if (EXTRACT_16BITS(&cp[2]) != 0)
-                               ND_PRINT((ndo, " value %u", EXTRACT_16BITS(&cp[2])));
+                       if (EXTRACT_BE_16BITS(cp + 2) != 0)
+                               ND_PRINT((ndo, " value %u", EXTRACT_BE_16BITS(cp + 2)));
                        break;
 
                case IPOPT_NOP:       /* nothing to print - fall through */
@@ -566,7 +566,7 @@ ip_print(netdissect_options *ndo,
                return;
        }
 
-       ipds->len = EXTRACT_16BITS(&ipds->ip->ip_len);
+       ipds->len = EXTRACT_BE_16BITS(&ipds->ip->ip_len);
        if (length < ipds->len)
                ND_PRINT((ndo, "truncated-ip - %u bytes missing! ",
                        ipds->len - length));
@@ -595,7 +595,7 @@ ip_print(netdissect_options *ndo,
 
        ipds->len -= hlen;
 
-       ipds->off = EXTRACT_16BITS(&ipds->ip->ip_off);
+       ipds->off = EXTRACT_BE_16BITS(&ipds->ip->ip_off);
 
         if (ndo->ndo_vflag) {
             ND_PRINT((ndo, "(tos 0x%x", (int)ipds->ip->ip_tos));
@@ -628,13 +628,13 @@ ip_print(netdissect_options *ndo,
             */
 
            ND_PRINT((ndo, ", id %u, offset %u, flags [%s], proto %s (%u)",
-                         EXTRACT_16BITS(&ipds->ip->ip_id),
+                         EXTRACT_BE_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));
 
-            ND_PRINT((ndo, ", length %u", EXTRACT_16BITS(&ipds->ip->ip_len)));
+            ND_PRINT((ndo, ", length %u", EXTRACT_BE_16BITS(&ipds->ip->ip_len)));
 
             if ((hlen - sizeof(struct ip)) > 0) {
                 ND_PRINT((ndo, ", options ("));
@@ -647,7 +647,7 @@ ip_print(netdissect_options *ndo,
                vec[0].len = hlen;
                sum = in_cksum(vec, 1);
                if (sum != 0) {
-                   ip_sum = EXTRACT_16BITS(&ipds->ip->ip_sum);
+                   ip_sum = EXTRACT_BE_16BITS(&ipds->ip->ip_sum);
                    ND_PRINT((ndo, ", bad cksum %x (->%x)!", ip_sum,
                             in_cksum_shouldbe(ip_sum, sum)));
                }