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

[tcpdump] / print-dccp.c

diff --git a/print-dccp.c b/print-dccp.c
index 0d58d4390323c6939e69107302d19d7a430410c4..3c6435bada4ef5c3772d5f19b5fb68b622654973 100644 (file)
--- a/print-dccp.c
+++ b/print-dccp.c
@@ -245,10 +245,10 @@ static void dccp_print_ack_no(netdissect_options *ndo, const u_char *bp)
        uint64_t ackno;
 
        if (DCCPH_X(dh) != 0) {
-               ND_TCHECK2(*ackp, 8);
+               ND_TCHECK_8(ackp);
                ackno = EXTRACT_BE_U_6(ackp + 2);
        } else {
-               ND_TCHECK2(*ackp, 4);
+               ND_TCHECK_4(ackp);
                ackno = EXTRACT_BE_U_3(ackp + 1);
        }
 
@@ -542,7 +542,7 @@ static int dccp_print_option(netdissect_options *ndo, const u_char *option, u_in
                optlen = EXTRACT_U_1(option + 1);
                if (optlen < 2) {
                        if (*option >= 128)
-                               ND_PRINT((ndo, "CCID option %u optlen too short", *option));
+                               ND_PRINT((ndo, "CCID option %u optlen too short", EXTRACT_U_1(option)));
                        else
                                ND_PRINT((ndo, "%s optlen too short",
                                          tok2str(dccp_option_values, "Option %u", EXTRACT_U_1(option))));
@@ -554,7 +554,7 @@ static int dccp_print_option(netdissect_options *ndo, const u_char *option, u_in
        if (hlen < optlen) {
                if (*option >= 128)
                        ND_PRINT((ndo, "CCID option %u optlen goes past header length",
-                                 *option));
+                                 EXTRACT_U_1(option)));
                else
                        ND_PRINT((ndo, "%s optlen goes past header length",
                                  tok2str(dccp_option_values, "Option %u", EXTRACT_U_1(option))));
@@ -563,7 +563,7 @@ static int dccp_print_option(netdissect_options *ndo, const u_char *option, u_in
        ND_TCHECK2(*option, optlen);
 
        if (*option >= 128) {
-               ND_PRINT((ndo, "CCID option %d", *option));
+               ND_PRINT((ndo, "CCID option %d", EXTRACT_U_1(option)));
                switch (optlen) {
                        case 4:
                                ND_PRINT((ndo, " %u", EXTRACT_BE_U_2(option + 2)));
@@ -586,41 +586,41 @@ static int dccp_print_option(netdissect_options *ndo, const u_char *option, u_in
                                return optlen;
                        }
                        if (*(option + 2) < 10){
-                               ND_PRINT((ndo, " %s", dccp_feature_nums[*(option + 2)]));
+                               ND_PRINT((ndo, " %s", dccp_feature_nums[EXTRACT_U_1(option + 2)]));
                                for (i = 0; i < optlen - 3; i++)
-                                       ND_PRINT((ndo, " %d", *(option + 3 + i)));
+                                       ND_PRINT((ndo, " %d", EXTRACT_U_1(option + 3 + i)));
                        }
                        break;
                case 36:
                        if (optlen > 2) {
                                ND_PRINT((ndo, " 0x"));
                                for (i = 0; i < optlen - 2; i++)
-                                       ND_PRINT((ndo, "%02x", *(option + 2 + i)));
+                                       ND_PRINT((ndo, "%02x", EXTRACT_U_1(option + 2 + i)));
                        }
                        break;
                case 37:
                        for (i = 0; i < optlen - 2; i++)
-                               ND_PRINT((ndo, " %d", *(option + 2 + i)));
+                               ND_PRINT((ndo, " %d", EXTRACT_U_1(option + 2 + i)));
                        break;
                case 38:
                        if (optlen > 2) {
                                ND_PRINT((ndo, " 0x"));
                                for (i = 0; i < optlen - 2; i++)
-                                       ND_PRINT((ndo, "%02x", *(option + 2 + i)));
+                                       ND_PRINT((ndo, "%02x", EXTRACT_U_1(option + 2 + i)));
                        }
                        break;
                case 39:
                        if (optlen > 2) {
                                ND_PRINT((ndo, " 0x"));
                                for (i = 0; i < optlen - 2; i++)
-                                       ND_PRINT((ndo, "%02x", *(option + 2 + i)));
+                                       ND_PRINT((ndo, "%02x", EXTRACT_U_1(option + 2 + i)));
                        }
                        break;
                case 40:
                        if (optlen > 2) {
                                ND_PRINT((ndo, " 0x"));
                                for (i = 0; i < optlen - 2; i++)
-                                       ND_PRINT((ndo, "%02x", *(option + 2 + i)));
+                                       ND_PRINT((ndo, "%02x", EXTRACT_U_1(option + 2 + i)));
                        }
                        break;
                case 41:
@@ -647,7 +647,7 @@ static int dccp_print_option(netdissect_options *ndo, const u_char *option, u_in
                        if (optlen > 2) {
                                ND_PRINT((ndo, " "));
                                for (i = 0; i < optlen - 2; i++)
-                                       ND_PRINT((ndo, "%02x", *(option + 2 + i)));
+                                       ND_PRINT((ndo, "%02x", EXTRACT_U_1(option + 2 + i)));
                        }
                        break;
                }