Rename EXTRACT_ macros

[tcpdump] / print-dccp.c

diff --git a/print-dccp.c b/print-dccp.c
index 7f7f81276e37d6c40f7efddefc183003e60fc052..0d58d4390323c6939e69107302d19d7a430410c4 100644 (file)
--- a/print-dccp.c
+++ b/print-dccp.c
@@ -225,9 +225,9 @@ static uint64_t dccp_seqno(const u_char *bp)
 
        if (DCCPH_X(dh) != 0) {
                const struct dccp_hdr_ext *dhx = (const struct dccp_hdr_ext *)bp;
-               seqno = EXTRACT_BE_48BITS(dhx->dccph_seq);
+               seqno = EXTRACT_BE_U_6(dhx->dccph_seq);
        } else {
-               seqno = EXTRACT_BE_24BITS(dh->dccph_seq);
+               seqno = EXTRACT_BE_U_3(dh->dccph_seq);
        }
 
        return seqno;
@@ -246,10 +246,10 @@ static void dccp_print_ack_no(netdissect_options *ndo, const u_char *bp)
 
        if (DCCPH_X(dh) != 0) {
                ND_TCHECK2(*ackp, 8);
-               ackno = EXTRACT_BE_48BITS(ackp + 2);
+               ackno = EXTRACT_BE_U_6(ackp + 2);
        } else {
                ND_TCHECK2(*ackp, 4);
-               ackno = EXTRACT_BE_24BITS(ackp + 1);
+               ackno = EXTRACT_BE_U_3(ackp + 1);
        }
 
        ND_PRINT((ndo, "(ack=%" PRIu64 ") ", ackno));
@@ -307,8 +307,8 @@ dccp_print(netdissect_options *ndo, const u_char *bp, const u_char *data2,
        }
        ND_TCHECK2(*dh, fixed_hdrlen);
 
-       sport = EXTRACT_BE_16BITS(&dh->dccph_sport);
-       dport = EXTRACT_BE_16BITS(&dh->dccph_dport);
+       sport = EXTRACT_BE_U_2(&dh->dccph_sport);
+       dport = EXTRACT_BE_U_2(&dh->dccph_dport);
        hlen = dh->dccph_doff * 4;
 
        if (ip6) {
@@ -341,7 +341,7 @@ dccp_print(netdissect_options *ndo, const u_char *bp, const u_char *data2,
        if (ndo->ndo_vflag && ND_TTEST2(bp[0], len)) {
                uint16_t sum = 0, dccp_sum;
 
-               dccp_sum = EXTRACT_BE_16BITS(&dh->dccph_checksum);
+               dccp_sum = EXTRACT_BE_U_2(&dh->dccph_checksum);
                ND_PRINT((ndo, "cksum 0x%04x ", dccp_sum));
                if (IP_V(ip) == 4)
                        sum = dccp_cksum(ndo, ip, dh, len);
@@ -372,7 +372,7 @@ dccp_print(netdissect_options *ndo, const u_char *bp, const u_char *data2,
                ND_TCHECK(*dhr);
                ND_PRINT((ndo, "%s (service=%d) ",
                          tok2str(dccp_pkt_type_str, "", dccph_type),
-                         EXTRACT_BE_32BITS(&dhr->dccph_req_service)));
+                         EXTRACT_BE_U_4(&dhr->dccph_req_service)));
                break;
        }
        case DCCP_PKT_RESPONSE: {
@@ -388,7 +388,7 @@ dccp_print(netdissect_options *ndo, const u_char *bp, const u_char *data2,
                ND_TCHECK(*dhr);
                ND_PRINT((ndo, "%s (service=%d) ",
                          tok2str(dccp_pkt_type_str, "", dccph_type),
-                         EXTRACT_BE_32BITS(&dhr->dccph_resp_service)));
+                         EXTRACT_BE_U_4(&dhr->dccph_resp_service)));
                break;
        }
        case DCCP_PKT_DATA:
@@ -539,13 +539,13 @@ static int dccp_print_option(netdissect_options *ndo, const u_char *option, u_in
 
        if (*option >= 32) {
                ND_TCHECK(*(option+1));
-               optlen = EXTRACT_8BITS(option + 1);
+               optlen = EXTRACT_U_1(option + 1);
                if (optlen < 2) {
                        if (*option >= 128)
                                ND_PRINT((ndo, "CCID option %u optlen too short", *option));
                        else
                                ND_PRINT((ndo, "%s optlen too short",
-                                         tok2str(dccp_option_values, "Option %u", EXTRACT_8BITS(option))));
+                                         tok2str(dccp_option_values, "Option %u", EXTRACT_U_1(option))));
                        return 0;
                }
        } else
@@ -557,7 +557,7 @@ static int dccp_print_option(netdissect_options *ndo, const u_char *option, u_in
                                  *option));
                else
                        ND_PRINT((ndo, "%s optlen goes past header length",
-                                 tok2str(dccp_option_values, "Option %u", EXTRACT_8BITS(option))));
+                                 tok2str(dccp_option_values, "Option %u", EXTRACT_U_1(option))));
                return 0;
        }
        ND_TCHECK2(*option, optlen);
@@ -566,16 +566,16 @@ static int dccp_print_option(netdissect_options *ndo, const u_char *option, u_in
                ND_PRINT((ndo, "CCID option %d", *option));
                switch (optlen) {
                        case 4:
-                               ND_PRINT((ndo, " %u", EXTRACT_BE_16BITS(option + 2)));
+                               ND_PRINT((ndo, " %u", EXTRACT_BE_U_2(option + 2)));
                                break;
                        case 6:
-                               ND_PRINT((ndo, " %u", EXTRACT_BE_32BITS(option + 2)));
+                               ND_PRINT((ndo, " %u", EXTRACT_BE_U_4(option + 2)));
                                break;
                        default:
                                break;
                }
        } else {
-               ND_PRINT((ndo, "%s", tok2str(dccp_option_values, "Option %u", EXTRACT_8BITS(option))));
+               ND_PRINT((ndo, "%s", tok2str(dccp_option_values, "Option %u", EXTRACT_U_1(option))));
                switch (*option) {
                case 32:
                case 33:
@@ -625,21 +625,21 @@ static int dccp_print_option(netdissect_options *ndo, const u_char *option, u_in
                        break;
                case 41:
                        if (optlen == 4)
-                               ND_PRINT((ndo, " %u", EXTRACT_BE_32BITS(option + 2)));
+                               ND_PRINT((ndo, " %u", EXTRACT_BE_U_4(option + 2)));
                        else
                                ND_PRINT((ndo, " optlen != 4"));
                        break;
                case 42:
                        if (optlen == 4)
-                               ND_PRINT((ndo, " %u", EXTRACT_BE_32BITS(option + 2)));
+                               ND_PRINT((ndo, " %u", EXTRACT_BE_U_4(option + 2)));
                        else
                                ND_PRINT((ndo, " optlen != 4"));
                        break;
                case 43:
                        if (optlen == 6)
-                               ND_PRINT((ndo, " %u", EXTRACT_BE_32BITS(option + 2)));
+                               ND_PRINT((ndo, " %u", EXTRACT_BE_U_4(option + 2)));
                        else if (optlen == 4)
-                               ND_PRINT((ndo, " %u", EXTRACT_BE_16BITS(option + 2)));
+                               ND_PRINT((ndo, " %u", EXTRACT_BE_U_2(option + 2)));
                        else
                                ND_PRINT((ndo, " optlen != 4 or 6"));
                        break;