Rename EXTRACT_ macros

[tcpdump] / print-bootp.c

diff --git a/print-bootp.c b/print-bootp.c
index ee7f21bffafffa93dba0b887f0922afb3e9b27af..737c5afc5dd02142083d4e4448b31bb477f9f96c 100644 (file)
--- a/print-bootp.c
+++ b/print-bootp.c
@@ -317,35 +317,35 @@ bootp_print(netdissect_options *ndo,
        /* Only print interesting fields */
        if (bp->bp_hops)
                ND_PRINT((ndo, ", hops %d", bp->bp_hops));
        /* Only print interesting fields */
        if (bp->bp_hops)
                ND_PRINT((ndo, ", hops %d", bp->bp_hops));

-       if (EXTRACT_BE_32BITS(&bp->bp_xid))
-               ND_PRINT((ndo, ", xid 0x%x", EXTRACT_BE_32BITS(&bp->bp_xid)));
-       if (EXTRACT_BE_16BITS(&bp->bp_secs))
-               ND_PRINT((ndo, ", secs %d", EXTRACT_BE_16BITS(&bp->bp_secs)));
+       if (EXTRACT_BE_U_4(&bp->bp_xid))
+               ND_PRINT((ndo, ", xid 0x%x", EXTRACT_BE_U_4(&bp->bp_xid)));
+       if (EXTRACT_BE_U_2(&bp->bp_secs))
+               ND_PRINT((ndo, ", secs %d", EXTRACT_BE_U_2(&bp->bp_secs)));

 
        ND_TCHECK(bp->bp_flags);
        ND_PRINT((ndo, ", Flags [%s]",
 
        ND_TCHECK(bp->bp_flags);
        ND_PRINT((ndo, ", Flags [%s]",

-                 bittok2str(bootp_flag_values, "none", EXTRACT_BE_16BITS(&bp->bp_flags))));
+                 bittok2str(bootp_flag_values, "none", EXTRACT_BE_U_2(&bp->bp_flags))));

        if (ndo->ndo_vflag > 1)
        if (ndo->ndo_vflag > 1)

-               ND_PRINT((ndo, " (0x%04x)", EXTRACT_BE_16BITS(&bp->bp_flags)));
+               ND_PRINT((ndo, " (0x%04x)", EXTRACT_BE_U_2(&bp->bp_flags)));

 
        /* Client's ip address */
        ND_TCHECK(bp->bp_ciaddr);
 
        /* Client's ip address */
        ND_TCHECK(bp->bp_ciaddr);

-       if (EXTRACT_BE_32BITS(&bp->bp_ciaddr.s_addr))
+       if (EXTRACT_BE_U_4(&bp->bp_ciaddr.s_addr))

                ND_PRINT((ndo, "\n\t  Client-IP %s", ipaddr_string(ndo, &bp->bp_ciaddr)));
 
        /* 'your' ip address (bootp client) */
        ND_TCHECK(bp->bp_yiaddr);
                ND_PRINT((ndo, "\n\t  Client-IP %s", ipaddr_string(ndo, &bp->bp_ciaddr)));
 
        /* 'your' ip address (bootp client) */
        ND_TCHECK(bp->bp_yiaddr);

-       if (EXTRACT_BE_32BITS(&bp->bp_yiaddr.s_addr))
+       if (EXTRACT_BE_U_4(&bp->bp_yiaddr.s_addr))

                ND_PRINT((ndo, "\n\t  Your-IP %s", ipaddr_string(ndo, &bp->bp_yiaddr)));
 
        /* Server's ip address */
        ND_TCHECK(bp->bp_siaddr);
                ND_PRINT((ndo, "\n\t  Your-IP %s", ipaddr_string(ndo, &bp->bp_yiaddr)));
 
        /* Server's ip address */
        ND_TCHECK(bp->bp_siaddr);

-       if (EXTRACT_BE_32BITS(&bp->bp_siaddr.s_addr))
+       if (EXTRACT_BE_U_4(&bp->bp_siaddr.s_addr))

                ND_PRINT((ndo, "\n\t  Server-IP %s", ipaddr_string(ndo, &bp->bp_siaddr)));
 
        /* Gateway's ip address */
        ND_TCHECK(bp->bp_giaddr);
                ND_PRINT((ndo, "\n\t  Server-IP %s", ipaddr_string(ndo, &bp->bp_siaddr)));
 
        /* Gateway's ip address */
        ND_TCHECK(bp->bp_giaddr);

-       if (EXTRACT_BE_32BITS(&bp->bp_giaddr.s_addr))
+       if (EXTRACT_BE_U_4(&bp->bp_giaddr.s_addr))

                ND_PRINT((ndo, "\n\t  Gateway-IP %s", ipaddr_string(ndo, &bp->bp_giaddr)));
 
        /* Client's Ethernet address */
                ND_PRINT((ndo, "\n\t  Gateway-IP %s", ipaddr_string(ndo, &bp->bp_giaddr)));
 
        /* Client's Ethernet address */


@@ -355,7 +355,7 @@ bootp_print(netdissect_options *ndo,
        }
 
        ND_TCHECK_1(bp->bp_sname);              /* check first char only */
        }
 
        ND_TCHECK_1(bp->bp_sname);              /* check first char only */

-       if (EXTRACT_8BITS(bp->bp_sname)) {
+       if (EXTRACT_U_1(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)) {


@@ -366,7 +366,7 @@ bootp_print(netdissect_options *ndo,
                ND_PRINT((ndo, "\""));
        }
        ND_TCHECK_1(bp->bp_file);               /* check first char only */
                ND_PRINT((ndo, "\""));
        }
        ND_TCHECK_1(bp->bp_file);               /* check first char only */

-       if (EXTRACT_8BITS(bp->bp_file)) {
+       if (EXTRACT_U_1(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)) {


@@ -388,7 +388,7 @@ bootp_print(netdissect_options *ndo,
        else {
                uint32_t ul;
 
        else {
                uint32_t ul;
 

-               ul = EXTRACT_BE_32BITS(&bp->bp_vend);
+               ul = EXTRACT_BE_U_4(&bp->bp_vend);

                if (ul != 0)
                        ND_PRINT((ndo, "\n\t  Vendor-#0x%x", ul));
        }
                if (ul != 0)
                        ND_PRINT((ndo, "\n\t  Vendor-#0x%x", ul));
        }


@@ -607,12 +607,12 @@ rfc1048_print(netdissect_options *ndo,
        ND_PRINT((ndo, "\n\t  Vendor-rfc1048 Extensions"));
 
        /* Step over magic cookie */
        ND_PRINT((ndo, "\n\t  Vendor-rfc1048 Extensions"));
 
        /* Step over magic cookie */

-       ND_PRINT((ndo, "\n\t    Magic Cookie 0x%08x", EXTRACT_BE_32BITS(bp)));
+       ND_PRINT((ndo, "\n\t    Magic Cookie 0x%08x", EXTRACT_BE_U_4(bp)));

        bp += sizeof(int32_t);
 
        /* Loop while we there is a tag left in the buffer */
        while (ND_TTEST_1(bp)) {
        bp += sizeof(int32_t);
 
        /* Loop while we there is a tag left in the buffer */
        while (ND_TTEST_1(bp)) {

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

                bp++;
                if (tag == TAG_PAD && ndo->ndo_vflag < 3)
                        continue;
                bp++;
                if (tag == TAG_PAD && ndo->ndo_vflag < 3)
                        continue;


@@ -620,7 +620,7 @@ rfc1048_print(netdissect_options *ndo,
                        return;
                if (tag == TAG_EXTENDED_OPTION) {
                        ND_TCHECK_2(bp + 1);
                        return;
                if (tag == TAG_EXTENDED_OPTION) {
                        ND_TCHECK_2(bp + 1);

-                       tag = EXTRACT_BE_16BITS(bp + 1);
+                       tag = EXTRACT_BE_U_2(bp + 1);

                        /* XXX we don't know yet if the IANA will
                         * preclude overlap of 1-byte and 2-byte spaces.
                         * If not, we need to offset tag after this step.
                        /* XXX we don't know yet if the IANA will
                         * preclude overlap of 1-byte and 2-byte spaces.
                         * If not, we need to offset tag after this step.


@@ -635,7 +635,7 @@ rfc1048_print(netdissect_options *ndo,
                else {
                        /* Get the length; check for truncation */
                        ND_TCHECK_1(bp);
                else {
                        /* Get the length; check for truncation */
                        ND_TCHECK_1(bp);

-                       len = EXTRACT_8BITS(bp);
+                       len = EXTRACT_U_1(bp);

                        bp++;
                }
 
                        bp++;
                }
 


@@ -645,7 +645,7 @@ rfc1048_print(netdissect_options *ndo,
                if (tag == TAG_PAD && ndo->ndo_vflag > 2) {
                        u_int ntag = 1;
                        while (ND_TTEST_1(bp) &&
                if (tag == TAG_PAD && ndo->ndo_vflag > 2) {
                        u_int ntag = 1;
                        while (ND_TTEST_1(bp) &&

-                              EXTRACT_8BITS(bp) == TAG_PAD) {
+                              EXTRACT_U_1(bp) == TAG_PAD) {

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


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

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

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


@@ -668,7 +668,7 @@ 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 = EXTRACT_8BITS(bp);
+                               uc = EXTRACT_U_1(bp);

                                bp++;
                                cp = tok2str(tag2str, "?Option %u", uc);
                                if (idx % 4 == 0)
                                bp++;
                                cp = tok2str(tag2str, "?Option %u", uc);
                                if (idx % 4 == 0)


@@ -685,7 +685,7 @@ rfc1048_print(netdissect_options *ndo,
                        first = 1;
                        while (len > 1) {
                                len -= 2;
                        first = 1;
                        while (len > 1) {
                                len -= 2;

-                               us = EXTRACT_BE_16BITS(bp);
+                               us = EXTRACT_BE_U_2(bp);

                                bp += 2;
                                cp = tok2str(xtag2str, "?xT%u", us);
                                if (!first)
                                bp += 2;
                                cp = tok2str(xtag2str, "?xT%u", us);
                                if (!first)


@@ -728,7 +728,7 @@ rfc1048_print(netdissect_options *ndo,
                        while (len >= sizeof(ul)) {
                                if (!first)
                                        ND_PRINT((ndo, ","));
                        while (len >= sizeof(ul)) {
                                if (!first)
                                        ND_PRINT((ndo, ","));

-                               ul = EXTRACT_BE_32BITS(bp);
+                               ul = EXTRACT_BE_U_4(bp);

                                if (c == 'i') {
                                        ul = htonl(ul);
                                        ND_PRINT((ndo, "%s", ipaddr_string(ndo, &ul)));
                                if (c == 'i') {
                                        ul = htonl(ul);
                                        ND_PRINT((ndo, "%s", ipaddr_string(ndo, &ul)));


@@ -763,7 +763,7 @@ rfc1048_print(netdissect_options *ndo,
                        while (len >= sizeof(us)) {
                                if (!first)
                                        ND_PRINT((ndo, ","));
                        while (len >= sizeof(us)) {
                                if (!first)
                                        ND_PRINT((ndo, ","));

-                               us = EXTRACT_BE_16BITS(bp);
+                               us = EXTRACT_BE_U_2(bp);

                                ND_PRINT((ndo, "%u", us));
                                bp += sizeof(us);
                                len -= sizeof(us);
                                ND_PRINT((ndo, "%u", us));
                                bp += sizeof(us);
                                len -= sizeof(us);


@@ -777,7 +777,7 @@ rfc1048_print(netdissect_options *ndo,
                                uint8_t bool_value;
                                if (!first)
                                        ND_PRINT((ndo, ","));
                                uint8_t bool_value;
                                if (!first)
                                        ND_PRINT((ndo, ","));

-                               bool_value = EXTRACT_8BITS(bp);
+                               bool_value = EXTRACT_U_1(bp);

                                switch (bool_value) {
                                case 0:
                                        ND_PRINT((ndo, "N"));
                                switch (bool_value) {
                                case 0:
                                        ND_PRINT((ndo, "N"));


@@ -803,7 +803,7 @@ rfc1048_print(netdissect_options *ndo,
                                uint8_t byte_value;
                                if (!first)
                                        ND_PRINT((ndo, c == 'x' ? ":" : "."));
                                uint8_t byte_value;
                                if (!first)
                                        ND_PRINT((ndo, c == 'x' ? ":" : "."));

-                               byte_value = EXTRACT_8BITS(bp);
+                               byte_value = EXTRACT_U_1(bp);

                                if (c == 'x')
                                        ND_PRINT((ndo, "%02x", byte_value));
                                else
                                if (c == 'x')
                                        ND_PRINT((ndo, "%02x", byte_value));
                                else


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

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

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


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

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

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


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

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

                                bp++;
                                bp++;

-                               if (EXTRACT_8BITS(bp) || EXTRACT_8BITS(bp+1))
-                                       ND_PRINT((ndo, "%u/%u ", EXTRACT_8BITS(bp), EXTRACT_8BITS(bp+1)));
+                               if (EXTRACT_U_1(bp) || EXTRACT_U_1(bp + 1))
+                                       ND_PRINT((ndo, "%u/%u ", EXTRACT_U_1(bp), EXTRACT_U_1(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)) {


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

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

                                bp++;
                                len--;
                                if (type == 0) {
                                bp++;
                                len--;
                                if (type == 0) {


@@ -893,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", EXTRACT_8BITS(bp)));
+                                               ND_PRINT((ndo, "%02x", EXTRACT_U_1(bp)));

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


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

-                                       subopt = EXTRACT_8BITS(bp);
-                                       suboptlen = EXTRACT_8BITS(bp+1);
+                                       subopt = EXTRACT_U_1(bp);
+                                       suboptlen = EXTRACT_U_1(bp + 1);

                                        bp += 2;
                                        len -= 2;
                                        if (suboptlen > len) {
                                        bp += 2;
                                        len -= 2;
                                        if (suboptlen > len) {


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

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

                                        bp++;
                                        len--;
                                        /* mask_width <= 32 */
                                        bp++;
                                        len--;
                                        /* mask_width <= 32 */


@@ -979,7 +979,7 @@ 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", EXTRACT_8BITS(bp)));
+                                                       ND_PRINT((ndo, "%d", EXTRACT_U_1(bp)));

                                                        bp++;
                                                }
                                                for (i = significant_octets ; i < 4 ; i++)
                                                        bp++;
                                                }
                                                for (i = significant_octets ; i < 4 ; i++)


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

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

                                        bp++;
                                        len--;
                                        ND_PRINT((ndo, "\n\t      "));
                                        bp++;
                                        len--;
                                        ND_PRINT((ndo, "\n\t      "));