Use more the ND_TTEST_1() macro

[tcpdump] / print-ahcp.c

diff --git a/print-ahcp.c b/print-ahcp.c
index 2ef41618a62b6fe98efe26d58c3acc704ac8f127..8d784c14105a0a6c0bc8e1f8dd374eeb99fbf405 100644 (file)
--- a/print-ahcp.c
+++ b/print-ahcp.c
@@ -118,7 +118,7 @@ ahcp_time_print(netdissect_options *ndo, const u_char *cp, const u_char *ep)
 
 invalid:
        ND_PRINT((ndo, "%s", istr));
 
 invalid:
        ND_PRINT((ndo, "%s", istr));

-       ND_TCHECK2(*cp, ep - cp);
+       ND_TCHECK_LEN(cp, ep - cp);

        return 0;
 trunc:
        ND_PRINT((ndo, "%s", tstr));
        return 0;
 trunc:
        ND_PRINT((ndo, "%s", tstr));


@@ -136,7 +136,7 @@ ahcp_seconds_print(netdissect_options *ndo, const u_char *cp, const u_char *ep)
 
 invalid:
        ND_PRINT((ndo, "%s", istr));
 
 invalid:
        ND_PRINT((ndo, "%s", istr));

-       ND_TCHECK2(*cp, ep - cp);
+       ND_TCHECK_LEN(cp, ep - cp);

        return 0;
 trunc:
        ND_PRINT((ndo, "%s", tstr));
        return 0;
 trunc:
        ND_PRINT((ndo, "%s", tstr));


@@ -160,7 +160,7 @@ ahcp_ipv6_addresses_print(netdissect_options *ndo, const u_char *cp, const u_cha
 
 invalid:
        ND_PRINT((ndo, "%s", istr));
 
 invalid:
        ND_PRINT((ndo, "%s", istr));

-       ND_TCHECK2(*cp, ep - cp);
+       ND_TCHECK_LEN(cp, ep - cp);

        return 0;
 trunc:
        ND_PRINT((ndo, "%s", tstr));
        return 0;
 trunc:
        ND_PRINT((ndo, "%s", tstr));


@@ -184,7 +184,7 @@ ahcp_ipv4_addresses_print(netdissect_options *ndo, const u_char *cp, const u_cha
 
 invalid:
        ND_PRINT((ndo, "%s", istr));
 
 invalid:
        ND_PRINT((ndo, "%s", istr));

-       ND_TCHECK2(*cp, ep - cp);
+       ND_TCHECK_LEN(cp, ep - cp);

        return 0;
 trunc:
        ND_PRINT((ndo, "%s", tstr));
        return 0;
 trunc:
        ND_PRINT((ndo, "%s", tstr));


@@ -199,7 +199,7 @@ ahcp_ipv6_prefixes_print(netdissect_options *ndo, const u_char *cp, const u_char
        while (cp < ep) {
                if (cp + 17 > ep)
                        goto invalid;
        while (cp < ep) {
                if (cp + 17 > ep)
                        goto invalid;

-               ND_TCHECK2(*cp, 17);
+               ND_TCHECK_LEN(cp, 17);

                ND_PRINT((ndo, "%s%s/%u", sep, ip6addr_string(ndo, cp), EXTRACT_U_1(cp + 16)));
                cp += 17;
                sep = ", ";
                ND_PRINT((ndo, "%s%s/%u", sep, ip6addr_string(ndo, cp), EXTRACT_U_1(cp + 16)));
                cp += 17;
                sep = ", ";


@@ -208,7 +208,7 @@ ahcp_ipv6_prefixes_print(netdissect_options *ndo, const u_char *cp, const u_char
 
 invalid:
        ND_PRINT((ndo, "%s", istr));
 
 invalid:
        ND_PRINT((ndo, "%s", istr));

-       ND_TCHECK2(*cp, ep - cp);
+       ND_TCHECK_LEN(cp, ep - cp);

        return 0;
 trunc:
        ND_PRINT((ndo, "%s", tstr));
        return 0;
 trunc:
        ND_PRINT((ndo, "%s", tstr));


@@ -232,7 +232,7 @@ ahcp_ipv4_prefixes_print(netdissect_options *ndo, const u_char *cp, const u_char
 
 invalid:
        ND_PRINT((ndo, "%s", istr));
 
 invalid:
        ND_PRINT((ndo, "%s", istr));

-       ND_TCHECK2(*cp, ep - cp);
+       ND_TCHECK_LEN(cp, ep - cp);

        return 0;
 trunc:
        ND_PRINT((ndo, "%s", tstr));
        return 0;
 trunc:
        ND_PRINT((ndo, "%s", tstr));


@@ -266,7 +266,7 @@ ahcp1_options_print(netdissect_options *ndo, const u_char *cp, const u_char *ep)
        while (cp < ep) {
                /* Option no */
                ND_TCHECK_1(cp);
        while (cp < ep) {
                /* Option no */
                ND_TCHECK_1(cp);

-               option_no = *cp;
+               option_no = EXTRACT_U_1(cp);

                cp += 1;
                ND_PRINT((ndo, "\n\t %s", tok2str(ahcp1_opt_str, "Unknown-%u", option_no)));
                if (option_no == AHCP1_OPT_PAD || option_no == AHCP1_OPT_MANDATORY)
                cp += 1;
                ND_PRINT((ndo, "\n\t %s", tok2str(ahcp1_opt_str, "Unknown-%u", option_no)));
                if (option_no == AHCP1_OPT_PAD || option_no == AHCP1_OPT_MANDATORY)


@@ -275,7 +275,7 @@ ahcp1_options_print(netdissect_options *ndo, const u_char *cp, const u_char *ep)
                if (cp + 1 > ep)
                        goto invalid;
                ND_TCHECK_1(cp);
                if (cp + 1 > ep)
                        goto invalid;
                ND_TCHECK_1(cp);

-               option_len = *cp;
+               option_len = EXTRACT_U_1(cp);

                cp += 1;
                if (cp + option_len > ep)
                        goto invalid;
                cp += 1;
                if (cp + option_len > ep)
                        goto invalid;


@@ -285,7 +285,7 @@ ahcp1_options_print(netdissect_options *ndo, const u_char *cp, const u_char *ep)
                                break; /* truncated and already marked up */
                } else {
                        ND_PRINT((ndo, " (Length %u)", option_len));
                                break; /* truncated and already marked up */
                } else {
                        ND_PRINT((ndo, " (Length %u)", option_len));

-                       ND_TCHECK2(*cp, option_len);
+                       ND_TCHECK_LEN(cp, option_len);

                }
                cp += option_len;
        }
                }
                cp += option_len;
        }


@@ -293,7 +293,7 @@ ahcp1_options_print(netdissect_options *ndo, const u_char *cp, const u_char *ep)
 
 invalid:
        ND_PRINT((ndo, "%s", istr));
 
 invalid:
        ND_PRINT((ndo, "%s", istr));

-       ND_TCHECK2(*cp, ep - cp);
+       ND_TCHECK_LEN(cp, ep - cp);

        return;
 trunc:
        ND_PRINT((ndo, "%s", tstr));
        return;
 trunc:
        ND_PRINT((ndo, "%s", tstr));


@@ -309,11 +309,11 @@ ahcp1_body_print(netdissect_options *ndo, const u_char *cp, const u_char *ep)
                goto invalid;
        /* Type */
        ND_TCHECK_1(cp);
                goto invalid;
        /* Type */
        ND_TCHECK_1(cp);

-       type = *cp;
+       type = EXTRACT_U_1(cp);

        cp += 1;
        /* MBZ */
        ND_TCHECK_1(cp);
        cp += 1;
        /* MBZ */
        ND_TCHECK_1(cp);

-       mbz = *cp;
+       mbz = EXTRACT_U_1(cp);

        cp += 1;
        /* Length */
        ND_TCHECK_2(cp);
        cp += 1;
        /* Length */
        ND_TCHECK_2(cp);


@@ -333,12 +333,12 @@ ahcp1_body_print(netdissect_options *ndo, const u_char *cp, const u_char *ep)
        if (ndo->ndo_vflag >= 2)
                ahcp1_options_print(ndo, cp, cp + body_len); /* not ep (ignore extra data) */
        else
        if (ndo->ndo_vflag >= 2)
                ahcp1_options_print(ndo, cp, cp + body_len); /* not ep (ignore extra data) */
        else

-               ND_TCHECK2(*cp, body_len);
+               ND_TCHECK_LEN(cp, body_len);

        return;
 
 invalid:
        ND_PRINT((ndo, "%s", istr));
        return;
 
 invalid:
        ND_PRINT((ndo, "%s", istr));

-       ND_TCHECK2(*cp, ep - cp);
+       ND_TCHECK_LEN(cp, ep - cp);

        return;
 trunc:
        ND_PRINT((ndo, "%s", tstr));
        return;
 trunc:
        ND_PRINT((ndo, "%s", tstr));


@@ -355,12 +355,12 @@ ahcp_print(netdissect_options *ndo, const u_char *cp, const u_int len)
                goto invalid;
        /* Magic */
        ND_TCHECK_1(cp);
                goto invalid;
        /* Magic */
        ND_TCHECK_1(cp);

-       if (*cp != AHCP_MAGIC_NUMBER)
+       if (EXTRACT_U_1(cp) != AHCP_MAGIC_NUMBER)

                goto invalid;
        cp += 1;
        /* Version */
        ND_TCHECK_1(cp);
                goto invalid;
        cp += 1;
        /* Version */
        ND_TCHECK_1(cp);

-       version = *cp;
+       version = EXTRACT_U_1(cp);

        cp += 1;
        switch (version) {
                case AHCP_VERSION_1: {
        cp += 1;
        switch (version) {
                case AHCP_VERSION_1: {


@@ -368,16 +368,16 @@ ahcp_print(netdissect_options *ndo, const u_char *cp, const u_int len)
                        if (len < AHCP1_HEADER_FIX_LEN)
                                goto invalid;
                        if (!ndo->ndo_vflag) {
                        if (len < AHCP1_HEADER_FIX_LEN)
                                goto invalid;
                        if (!ndo->ndo_vflag) {

-                               ND_TCHECK2(*cp, AHCP1_HEADER_FIX_LEN - 2);
+                               ND_TCHECK_LEN(cp, AHCP1_HEADER_FIX_LEN - 2);

                                cp += AHCP1_HEADER_FIX_LEN - 2;
                        } else {
                                /* Hopcount */
                                ND_TCHECK_1(cp);
                                cp += AHCP1_HEADER_FIX_LEN - 2;
                        } else {
                                /* Hopcount */
                                ND_TCHECK_1(cp);

-                               ND_PRINT((ndo, "\n\tHopcount %u", *cp));
+                               ND_PRINT((ndo, "\n\tHopcount %u", EXTRACT_U_1(cp)));

                                cp += 1;
                                /* Original Hopcount */
                                ND_TCHECK_1(cp);
                                cp += 1;
                                /* Original Hopcount */
                                ND_TCHECK_1(cp);

-                               ND_PRINT((ndo, ", Original Hopcount %u", *cp));
+                               ND_PRINT((ndo, ", Original Hopcount %u", EXTRACT_U_1(cp)));

                                cp += 1;
                                /* Nonce */
                                ND_TCHECK_4(cp);
                                cp += 1;
                                /* Nonce */
                                ND_TCHECK_4(cp);


@@ -404,7 +404,7 @@ ahcp_print(netdissect_options *ndo, const u_char *cp, const u_int len)
 
 invalid:
        ND_PRINT((ndo, "%s", istr));
 
 invalid:
        ND_PRINT((ndo, "%s", istr));

-       ND_TCHECK2(*cp, ep - cp);
+       ND_TCHECK_LEN(cp, ep - cp);

        return;
 trunc:
        ND_PRINT((ndo, "%s", tstr));
        return;
 trunc:
        ND_PRINT((ndo, "%s", tstr));