Use more the ND_TTEST_1() macro

[tcpdump] / print-dccp.c

diff --git a/print-dccp.c b/print-dccp.c
index 0d58d4390323c6939e69107302d19d7a430410c4..66d215fe456fe590852fbeb0e615cc00c85b2613 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);
        }
 
@@ -305,7 +305,7 @@ dccp_print(netdissect_options *ndo, const u_char *bp, const u_char *data2,
                          len - fixed_hdrlen));
                return;
        }
-       ND_TCHECK2(*dh, fixed_hdrlen);
+       ND_TCHECK_LEN(dh, fixed_hdrlen);
 
        sport = EXTRACT_BE_U_2(&dh->dccph_sport);
        dport = EXTRACT_BE_U_2(&dh->dccph_dport);
@@ -338,7 +338,7 @@ dccp_print(netdissect_options *ndo, const u_char *bp, const u_char *data2,
        }
 
        /* checksum calculation */
-       if (ndo->ndo_vflag && ND_TTEST2(bp[0], len)) {
+       if (ndo->ndo_vflag && ND_TTEST_LEN(bp, len)) {
                uint16_t sum = 0, dccp_sum;
 
                dccp_sum = EXTRACT_BE_U_2(&dh->dccph_checksum);
@@ -535,14 +535,14 @@ static int dccp_print_option(netdissect_options *ndo, const u_char *option, u_in
 {
        uint8_t optlen, i;
 
-       ND_TCHECK(*option);
+       ND_TCHECK_1(option);
 
-       if (*option >= 32) {
-               ND_TCHECK(*(option+1));
+       if (EXTRACT_U_1(option) >= 32) {
+               ND_TCHECK_1(option + 1);
                optlen = EXTRACT_U_1(option + 1);
                if (optlen < 2) {
-                       if (*option >= 128)
-                               ND_PRINT((ndo, "CCID option %u optlen too short", *option));
+                       if (EXTRACT_U_1(option) >= 128)
+                               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))));
@@ -552,18 +552,18 @@ static int dccp_print_option(netdissect_options *ndo, const u_char *option, u_in
                optlen = 1;
 
        if (hlen < optlen) {
-               if (*option >= 128)
+               if (EXTRACT_U_1(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))));
                return 0;
        }
-       ND_TCHECK2(*option, optlen);
+       ND_TCHECK_LEN(option, optlen);
 
-       if (*option >= 128) {
-               ND_PRINT((ndo, "CCID option %d", *option));
+       if (EXTRACT_U_1(option) >= 128) {
+               ND_PRINT((ndo, "CCID option %d", EXTRACT_U_1(option)));
                switch (optlen) {
                        case 4:
                                ND_PRINT((ndo, " %u", EXTRACT_BE_U_2(option + 2)));
@@ -576,7 +576,7 @@ static int dccp_print_option(netdissect_options *ndo, const u_char *option, u_in
                }
        } else {
                ND_PRINT((ndo, "%s", tok2str(dccp_option_values, "Option %u", EXTRACT_U_1(option))));
-               switch (*option) {
+               switch (EXTRACT_U_1(option)) {
                case 32:
                case 33:
                case 34:
@@ -585,42 +585,42 @@ static int dccp_print_option(netdissect_options *ndo, const u_char *option, u_in
                                ND_PRINT((ndo, " optlen too short"));
                                return optlen;
                        }
-                       if (*(option + 2) < 10){
-                               ND_PRINT((ndo, " %s", dccp_feature_nums[*(option + 2)]));
+                       if (EXTRACT_U_1(option + 2) < 10){
+                               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;
                }