More EXTRACT_8BITS(), more ND_TCHECK_nBITS(), other cleanups.

[tcpdump] / print-bootp.c

diff --git a/print-bootp.c b/print-bootp.c
index 2f97352129aa5abd02d36e574e81ca7ba7175c89..5a368cf282e01f99a88f0e330913ecceaa9ebdae 100644 (file)
--- a/print-bootp.c
+++ b/print-bootp.c
@@ -354,8 +354,8 @@ bootp_print(netdissect_options *ndo,
                ND_PRINT((ndo, "\n\t  Client-Ethernet-Address %s", etheraddr_string(ndo, bp->bp_chaddr)));
        }
 
                ND_PRINT((ndo, "\n\t  Client-Ethernet-Address %s", etheraddr_string(ndo, bp->bp_chaddr)));
        }
 

-       ND_TCHECK2(bp->bp_sname[0], 1);         /* check first char only */
-       if (*bp->bp_sname) {
+       ND_TCHECK_8BITS(bp->bp_sname);          /* check first char only */
+       if (EXTRACT_8BITS(bp->bp_sname)) {

                ND_PRINT((ndo, "\n\t  sname \""));
                if (fn_printztn(ndo, bp->bp_sname, (u_int)sizeof bp->bp_sname,
                    ndo->ndo_snapend)) {
                ND_PRINT((ndo, "\n\t  sname \""));
                if (fn_printztn(ndo, bp->bp_sname, (u_int)sizeof bp->bp_sname,
                    ndo->ndo_snapend)) {


@@ -365,8 +365,8 @@ bootp_print(netdissect_options *ndo,
                }
                ND_PRINT((ndo, "\""));
        }
                }
                ND_PRINT((ndo, "\""));
        }

-       ND_TCHECK2(bp->bp_file[0], 1);          /* check first char only */
-       if (*bp->bp_file) {
+       ND_TCHECK_8BITS(bp->bp_file);           /* check first char only */
+       if (EXTRACT_8BITS(bp->bp_file)) {

                ND_PRINT((ndo, "\n\t  file \""));
                if (fn_printztn(ndo, bp->bp_file, (u_int)sizeof bp->bp_file,
                    ndo->ndo_snapend)) {
                ND_PRINT((ndo, "\n\t  file \""));
                if (fn_printztn(ndo, bp->bp_file, (u_int)sizeof bp->bp_file,
                    ndo->ndo_snapend)) {


@@ -611,14 +611,15 @@ rfc1048_print(netdissect_options *ndo,
        bp += sizeof(int32_t);
 
        /* Loop while we there is a tag left in the buffer */
        bp += sizeof(int32_t);
 
        /* Loop while we there is a tag left in the buffer */

-       while (ND_TTEST2(*bp, 1)) {
-               tag = *bp++;
+       while (ND_TTEST_8BITS(bp)) {
+               tag = EXTRACT_8BITS(bp);
+               bp++;

                if (tag == TAG_PAD && ndo->ndo_vflag < 3)
                        continue;
                if (tag == TAG_END && ndo->ndo_vflag < 3)
                        return;
                if (tag == TAG_EXTENDED_OPTION) {
                if (tag == TAG_PAD && ndo->ndo_vflag < 3)
                        continue;
                if (tag == TAG_END && ndo->ndo_vflag < 3)
                        return;
                if (tag == TAG_EXTENDED_OPTION) {

-                       ND_TCHECK2(*(bp + 1), 2);
+                       ND_TCHECK_16BITS(bp + 1);

                        tag = EXTRACT_BE_16BITS(bp + 1);
                        /* XXX we don't know yet if the IANA will
                         * preclude overlap of 1-byte and 2-byte spaces.
                        tag = EXTRACT_BE_16BITS(bp + 1);
                        /* XXX we don't know yet if the IANA will
                         * preclude overlap of 1-byte and 2-byte spaces.


@@ -633,8 +634,9 @@ rfc1048_print(netdissect_options *ndo,
                        len = 0;
                else {
                        /* Get the length; check for truncation */
                        len = 0;
                else {
                        /* Get the length; check for truncation */

-                       ND_TCHECK2(*bp, 1);
-                       len = *bp++;
+                       ND_TCHECK_8BITS(bp);
+                       len = EXTRACT_8BITS(bp);
+                       bp++;

                }
 
                ND_PRINT((ndo, "\n\t    %s Option %u, length %u%s", cp, tag, len,
                }
 
                ND_PRINT((ndo, "\n\t    %s Option %u, length %u%s", cp, tag, len,


@@ -642,7 +644,8 @@ rfc1048_print(netdissect_options *ndo,
 
                if (tag == TAG_PAD && ndo->ndo_vflag > 2) {
                        u_int ntag = 1;
 
                if (tag == TAG_PAD && ndo->ndo_vflag > 2) {
                        u_int ntag = 1;

-                       while (ND_TTEST2(*bp, 1) && *bp == TAG_PAD) {
+                       while (ND_TTEST_8BITS(bp) &&
+                           EXTRACT_8BITS(bp) == TAG_PAD) {

                                bp++;
                                ntag++;
                        }
                                bp++;
                                ntag++;
                        }


@@ -656,7 +659,8 @@ rfc1048_print(netdissect_options *ndo,
                }
 
                if (tag == TAG_DHCP_MESSAGE && len == 1) {
                }
 
                if (tag == TAG_DHCP_MESSAGE && len == 1) {

-                       uc = *bp++;
+                       uc = EXTRACT_8BITS(bp);
+                       bp++;

                        ND_PRINT((ndo, "%s", tok2str(dhcp_msg_values, "Unknown (%u)", uc)));
                        continue;
                }
                        ND_PRINT((ndo, "%s", tok2str(dhcp_msg_values, "Unknown (%u)", uc)));
                        continue;
                }


@@ -664,7 +668,8 @@ rfc1048_print(netdissect_options *ndo,
                if (tag == TAG_PARM_REQUEST) {
                        idx = 0;
                        while (len-- > 0) {
                if (tag == TAG_PARM_REQUEST) {
                        idx = 0;
                        while (len-- > 0) {

-                               uc = *bp++;
+                               uc = EXTRACT_8BITS(bp);
+                               bp++;

                                cp = tok2str(tag2str, "?Option %u", uc);
                                if (idx % 4 == 0)
                                        ND_PRINT((ndo, "\n\t      "));
                                cp = tok2str(tag2str, "?Option %u", uc);
                                if (idx % 4 == 0)
                                        ND_PRINT((ndo, "\n\t      "));


@@ -769,9 +774,11 @@ rfc1048_print(netdissect_options *ndo,
                case 'B':
                        /* boolean */
                        while (len > 0) {
                case 'B':
                        /* boolean */
                        while (len > 0) {

+                               uint8_t bool_value;

                                if (!first)
                                        ND_PRINT((ndo, ","));
                                if (!first)
                                        ND_PRINT((ndo, ","));

-                               switch (*bp) {
+                               bool_value = EXTRACT_8BITS(bp);
+                               switch (bool_value) {

                                case 0:
                                        ND_PRINT((ndo, "N"));
                                        break;
                                case 0:
                                        ND_PRINT((ndo, "N"));
                                        break;


@@ -779,7 +786,7 @@ rfc1048_print(netdissect_options *ndo,
                                        ND_PRINT((ndo, "Y"));
                                        break;
                                default:
                                        ND_PRINT((ndo, "Y"));
                                        break;
                                default:

-                                       ND_PRINT((ndo, "%u?", *bp));
+                                       ND_PRINT((ndo, "%u?", bool_value));

                                        break;
                                }
                                ++bp;
                                        break;
                                }
                                ++bp;


@@ -793,12 +800,14 @@ rfc1048_print(netdissect_options *ndo,
                default:
                        /* Bytes */
                        while (len > 0) {
                default:
                        /* Bytes */
                        while (len > 0) {

+                               uint8_t byte_value;

                                if (!first)
                                        ND_PRINT((ndo, c == 'x' ? ":" : "."));
                                if (!first)
                                        ND_PRINT((ndo, c == 'x' ? ":" : "."));

+                               byte_value = EXTRACT_8BITS(bp);

                                if (c == 'x')
                                if (c == 'x')

-                                       ND_PRINT((ndo, "%02x", *bp));
+                                       ND_PRINT((ndo, "%02x", byte_value));

                                else
                                else

-                                       ND_PRINT((ndo, "%u", *bp));
+                                       ND_PRINT((ndo, "%u", byte_value));

                                ++bp;
                                --len;
                                first = 0;
                                ++bp;
                                --len;
                                first = 0;


@@ -815,7 +824,8 @@ rfc1048_print(netdissect_options *ndo,
                                        ND_PRINT((ndo, "ERROR: length < 1 bytes"));
                                        break;
                                }
                                        ND_PRINT((ndo, "ERROR: length < 1 bytes"));
                                        break;
                                }

-                               tag = *bp++;
+                               tag = EXTRACT_8BITS(bp);
+                               ++bp;

                                --len;
                                ND_PRINT((ndo, "%s", tok2str(nbo2str, NULL, tag)));
                                break;
                                --len;
                                ND_PRINT((ndo, "%s", tok2str(nbo2str, NULL, tag)));
                                break;


@@ -826,7 +836,8 @@ rfc1048_print(netdissect_options *ndo,
                                        ND_PRINT((ndo, "ERROR: length < 1 bytes"));
                                        break;
                                }
                                        ND_PRINT((ndo, "ERROR: length < 1 bytes"));
                                        break;
                                }

-                               tag = *bp++;
+                               tag = EXTRACT_8BITS(bp);
+                               ++bp;

                                --len;
                                ND_PRINT((ndo, "%s", tok2str(oo2str, NULL, tag)));
                                break;
                                --len;
                                ND_PRINT((ndo, "%s", tok2str(oo2str, NULL, tag)));
                                break;


@@ -839,11 +850,11 @@ rfc1048_print(netdissect_options *ndo,
                                        len = 0;
                                        break;
                                }
                                        len = 0;
                                        break;
                                }

-                               if (*bp)
+                               if (EXTRACT_8BITS(bp))

                                        ND_PRINT((ndo, "[%s] ", client_fqdn_flags(EXTRACT_8BITS(bp))));
                                bp++;
                                        ND_PRINT((ndo, "[%s] ", client_fqdn_flags(EXTRACT_8BITS(bp))));
                                bp++;

-                               if (*bp || *(bp+1))
-                                       ND_PRINT((ndo, "%u/%u ", *bp, *(bp+1)));
+                               if (EXTRACT_8BITS(bp) || EXTRACT_8BITS(bp+1))
+                                       ND_PRINT((ndo, "%u/%u ", EXTRACT_8BITS(bp), EXTRACT_8BITS(bp+1)));

                                bp += 2;
                                ND_PRINT((ndo, "\""));
                                if (fn_printn(ndo, bp, len - 3, ndo->ndo_snapend)) {
                                bp += 2;
                                ND_PRINT((ndo, "\""));
                                if (fn_printn(ndo, bp, len - 3, ndo->ndo_snapend)) {


@@ -864,7 +875,8 @@ rfc1048_print(netdissect_options *ndo,
                                        ND_PRINT((ndo, "ERROR: length < 1 bytes"));
                                        break;
                                }
                                        ND_PRINT((ndo, "ERROR: length < 1 bytes"));
                                        break;
                                }

-                               type = *bp++;
+                               type = EXTRACT_8BITS(bp);
+                               bp++;

                                len--;
                                if (type == 0) {
                                        ND_PRINT((ndo, "\""));
                                len--;
                                if (type == 0) {
                                        ND_PRINT((ndo, "\""));


@@ -881,7 +893,7 @@ rfc1048_print(netdissect_options *ndo,
                                        while (len > 0) {
                                                if (!first)
                                                        ND_PRINT((ndo, ":"));
                                        while (len > 0) {
                                                if (!first)
                                                        ND_PRINT((ndo, ":"));

-                                               ND_PRINT((ndo, "%02x", *bp));
+                                               ND_PRINT((ndo, "%02x", EXTRACT_8BITS(bp)));

                                                ++bp;
                                                --len;
                                                first = 0;
                                                ++bp;
                                                --len;
                                                first = 0;


@@ -892,8 +904,9 @@ rfc1048_print(netdissect_options *ndo,
 
                        case TAG_AGENT_CIRCUIT:
                                while (len >= 2) {
 
                        case TAG_AGENT_CIRCUIT:
                                while (len >= 2) {

-                                       subopt = *bp++;
-                                       suboptlen = *bp++;
+                                       subopt = EXTRACT_8BITS(bp);
+                                       suboptlen = EXTRACT_8BITS(bp+1);
+                                       bp += 2;

                                        len -= 2;
                                        if (suboptlen > len) {
                                                ND_PRINT((ndo, "\n\t      %s SubOption %u, length %u: length goes past end of option",
                                        len -= 2;
                                        if (suboptlen > len) {
                                                ND_PRINT((ndo, "\n\t      %s SubOption %u, length %u: length goes past end of option",


@@ -941,7 +954,8 @@ rfc1048_print(netdissect_options *ndo,
                                while (len > 0) {
                                        if (!first)
                                                ND_PRINT((ndo, ","));
                                while (len > 0) {
                                        if (!first)
                                                ND_PRINT((ndo, ","));

-                                       mask_width = *bp++;
+                                       mask_width = EXTRACT_8BITS(bp);
+                                       bp++;

                                        len--;
                                        /* mask_width <= 32 */
                                        if (mask_width > 32) {
                                        len--;
                                        /* mask_width <= 32 */
                                        if (mask_width > 32) {


@@ -965,7 +979,8 @@ rfc1048_print(netdissect_options *ndo,
                                                for (i = 0; i < significant_octets ; i++) {
                                                        if (i > 0)
                                                                ND_PRINT((ndo, "."));
                                                for (i = 0; i < significant_octets ; i++) {
                                                        if (i > 0)
                                                                ND_PRINT((ndo, "."));

-                                                       ND_PRINT((ndo, "%d", *bp++));
+                                                       ND_PRINT((ndo, "%d", EXTRACT_8BITS(bp)));
+                                                       bp++;

                                                }
                                                for (i = significant_octets ; i < 4 ; i++)
                                                        ND_PRINT((ndo, ".0"));
                                                }
                                                for (i = significant_octets ; i < 4 ; i++)
                                                        ND_PRINT((ndo, ".0"));


@@ -992,7 +1007,8 @@ rfc1048_print(netdissect_options *ndo,
                                        break;
                                }
                                while (len > 0) {
                                        break;
                                }
                                while (len > 0) {

-                                       suboptlen = *bp++;
+                                       suboptlen = EXTRACT_8BITS(bp);
+                                       bp++;

                                        len--;
                                        ND_PRINT((ndo, "\n\t      "));
                                        ND_PRINT((ndo, "instance#%u: ", suboptnumber));
                                        len--;
                                        ND_PRINT((ndo, "\n\t      "));
                                        ND_PRINT((ndo, "instance#%u: ", suboptnumber));