Use more the EXTRACT_U_1() macro (55/n)

[tcpdump] / print-ip.c

diff --git a/print-ip.c b/print-ip.c
index 1caa93c4e26046d9ffd864cc8870627ffeba5771..b9d39cf511dde65db4230b6596419e9091e9fe46 100644 (file)
--- a/print-ip.c
+++ b/print-ip.c
@@ -67,8 +67,8 @@ ip_printroute(netdissect_options *ndo,
        }
        if ((length + 1) & 3)
                ND_PRINT((ndo, " [bad length %u]", length));
        }
        if ((length + 1) & 3)
                ND_PRINT((ndo, " [bad length %u]", length));

-       ND_TCHECK(cp[2]);
-       ptr = cp[2] - 1;
+       ND_TCHECK_1(cp + 2);
+       ptr = EXTRACT_U_1(cp + 2) - 1;

        if (ptr < 3 || ((ptr + 1) & 3) || ptr > length + 1)
                ND_PRINT((ndo, " [bad ptr %u]", EXTRACT_U_1(cp + 2)));
 
        if (ptr < 3 || ((ptr + 1) & 3) || ptr > length + 1)
                ND_PRINT((ndo, " [bad ptr %u]", EXTRACT_U_1(cp + 2)));
 


@@ -106,15 +106,15 @@ ip_finddst(netdissect_options *ndo,
        for (; length > 0; cp += len, length -= len) {
                int tt;
 
        for (; length > 0; cp += len, length -= len) {
                int tt;
 

-               ND_TCHECK(*cp);
-               tt = *cp;
+               ND_TCHECK_1(cp);
+               tt = EXTRACT_U_1(cp);

                if (tt == IPOPT_EOL)
                        break;
                else if (tt == IPOPT_NOP)
                        len = 1;
                else {
                if (tt == IPOPT_EOL)
                        break;
                else if (tt == IPOPT_NOP)
                        len = 1;
                else {

-                       ND_TCHECK(cp[1]);
-                       len = cp[1];
+                       ND_TCHECK_1(cp + 1);
+                       len = EXTRACT_U_1(cp + 1);

                        if (len < 2)
                                break;
                }
                        if (len < 2)
                                break;
                }


@@ -182,15 +182,16 @@ ip_printts(netdissect_options *ndo,
                return (0);
        }
        ND_PRINT((ndo, " TS{"));
                return (0);
        }
        ND_PRINT((ndo, " TS{"));

-       hoplen = ((cp[3]&0xF) != IPOPT_TS_TSONLY) ? 8 : 4;
+       ND_TCHECK_1(cp + 3);
+       hoplen = ((EXTRACT_U_1(cp + 3) & 0xF) != IPOPT_TS_TSONLY) ? 8 : 4;

        if ((length - 4) & (hoplen-1))
                ND_PRINT((ndo, "[bad length %u]", length));
        if ((length - 4) & (hoplen-1))
                ND_PRINT((ndo, "[bad length %u]", length));

-       ND_TCHECK(cp[2]);
-       ptr = cp[2] - 1;
+       ND_TCHECK_1(cp + 2);
+       ptr = EXTRACT_U_1(cp + 2) - 1;

        len = 0;
        if (ptr < 4 || ((ptr - 4) & (hoplen-1)) || ptr > length + 1)
                ND_PRINT((ndo, "[bad ptr %u]", EXTRACT_U_1(cp + 2)));
        len = 0;
        if (ptr < 4 || ((ptr - 4) & (hoplen-1)) || ptr > length + 1)
                ND_PRINT((ndo, "[bad ptr %u]", EXTRACT_U_1(cp + 2)));

-       ND_TCHECK(cp[3]);
+       ND_TCHECK_1(cp + 3);

        switch (EXTRACT_U_1(cp + 3)&0xF) {
        case IPOPT_TS_TSONLY:
                ND_PRINT((ndo, "TSONLY"));
        switch (EXTRACT_U_1(cp + 3)&0xF) {
        case IPOPT_TS_TSONLY:
                ND_PRINT((ndo, "TSONLY"));


@@ -254,8 +255,8 @@ ip_optprint(netdissect_options *ndo,
                ND_PRINT((ndo, "%s", sep));
                sep = ",";
 
                ND_PRINT((ndo, "%s", sep));
                sep = ",";
 

-               ND_TCHECK(*cp);
-               option_code = *cp;
+               ND_TCHECK_1(cp);
+               option_code = EXTRACT_U_1(cp);

 
                ND_PRINT((ndo, "%s",
                          tok2str(ip_option_values,"unknown %u",option_code)));
 
                ND_PRINT((ndo, "%s",
                          tok2str(ip_option_values,"unknown %u",option_code)));


@@ -265,8 +266,8 @@ ip_optprint(netdissect_options *ndo,
                        option_len = 1;
 
                else {
                        option_len = 1;
 
                else {

-                       ND_TCHECK(cp[1]);
-                       option_len = cp[1];
+                       ND_TCHECK_1(cp + 1);
+                       option_len = EXTRACT_U_1(cp + 1);

                        if (option_len < 2) {
                                ND_PRINT((ndo, " [bad length %u]", option_len));
                                return;
                        if (option_len < 2) {
                                ND_PRINT((ndo, " [bad length %u]", option_len));
                                return;


@@ -301,7 +302,7 @@ ip_optprint(netdissect_options *ndo,
                                ND_PRINT((ndo, " [bad length %u]", option_len));
                                break;
                        }
                                ND_PRINT((ndo, " [bad length %u]", option_len));
                                break;
                        }

-                       ND_TCHECK(cp[3]);
+                       ND_TCHECK_1(cp + 3);

                        if (EXTRACT_BE_U_2(cp + 2) != 0)
                                ND_PRINT((ndo, " value %u", EXTRACT_BE_U_2(cp + 2)));
                        break;
                        if (EXTRACT_BE_U_2(cp + 2) != 0)
                                ND_PRINT((ndo, " value %u", EXTRACT_BE_U_2(cp + 2)));
                        break;


@@ -349,7 +350,7 @@ again:
                        ND_PRINT((ndo, "[|AH]"));
                        break;
                }
                        ND_PRINT((ndo, "[|AH]"));
                        break;
                }

-               ipds->nh = *ipds->cp;
+               ipds->nh = EXTRACT_U_1(ipds->cp);

                ipds->advance = ah_print(ndo, ipds->cp);
                if (ipds->advance <= 0)
                        break;
                ipds->advance = ah_print(ndo, ipds->cp);
                if (ipds->advance <= 0)
                        break;


@@ -706,8 +707,8 @@ ipN_print(netdissect_options *ndo, register const u_char *bp, register u_int len
                return;
        }
 
                return;
        }
 

-       ND_TCHECK(*bp);
-       switch (*bp & 0xF0) {
+       ND_TCHECK_1(bp);
+       switch (EXTRACT_U_1(bp) & 0xF0) {

        case 0x40:
                ip_print (ndo, bp, length);
                break;
        case 0x40:
                ip_print (ndo, bp, length);
                break;