Use more the ND_TTEST_1() macro

[tcpdump] / print-isakmp.c

diff --git a/print-isakmp.c b/print-isakmp.c
index fa9fa23978c6375d149c8cd00c21441e745a2b11..a2683ac61a0d17c09d71dfb06ff406729eda1382 100644 (file)
--- a/print-isakmp.c
+++ b/print-isakmp.c
@@ -862,7 +862,7 @@ hexprint(netdissect_options *ndo, const uint8_t *loc, size_t len)
 static int
 rawprint(netdissect_options *ndo, const uint8_t *loc, size_t len)
 {
 static int
 rawprint(netdissect_options *ndo, const uint8_t *loc, size_t len)
 {

-       ND_TCHECK2(*loc, len);
+       ND_TCHECK_LEN(loc, len);

 
        hexprint(ndo, loc, len);
        return 1;
 
        hexprint(ndo, loc, len);
        return 1;


@@ -918,8 +918,8 @@ ikev1_attrmap_print(netdissect_options *ndo,
        int totlen;
        uint32_t t, v;
 
        int totlen;
        uint32_t t, v;
 

-       ND_TCHECK(p[0]);
-       if (p[0] & 0x80)
+       ND_TCHECK_1(p);
+       if (EXTRACT_U_1(p) & 0x80)

                totlen = 4;
        else {
                ND_TCHECK_2(p + 2);
                totlen = 4;
        else {
                ND_TCHECK_2(p + 2);


@@ -937,21 +937,21 @@ ikev1_attrmap_print(netdissect_options *ndo,
                ND_PRINT((ndo,"type=%s ", map[t].type));
        else
                ND_PRINT((ndo,"type=#%d ", t));
                ND_PRINT((ndo,"type=%s ", map[t].type));
        else
                ND_PRINT((ndo,"type=#%d ", t));

-       if (p[0] & 0x80) {
+       if (EXTRACT_U_1(p) & 0x80) {

                ND_PRINT((ndo,"value="));
                ND_TCHECK_2(p + 2);
                v = EXTRACT_BE_U_2(p + 2);
                if (map && t < nmap && v < map[t].nvalue && map[t].value[v])
                        ND_PRINT((ndo,"%s", map[t].value[v]));
                else {
                ND_PRINT((ndo,"value="));
                ND_TCHECK_2(p + 2);
                v = EXTRACT_BE_U_2(p + 2);
                if (map && t < nmap && v < map[t].nvalue && map[t].value[v])
                        ND_PRINT((ndo,"%s", map[t].value[v]));
                else {

-                       if (!rawprint(ndo, (const uint8_t *)&p[2], 2)) {
+                       if (!rawprint(ndo, (const uint8_t *)(p + 2), 2)) {

                                ND_PRINT((ndo,")"));
                                goto trunc;
                        }
                }
        } else {
                ND_PRINT((ndo,"len=%d value=", totlen - 4));
                                ND_PRINT((ndo,")"));
                                goto trunc;
                        }
                }
        } else {
                ND_PRINT((ndo,"len=%d value=", totlen - 4));

-               if (!rawprint(ndo, (const uint8_t *)&p[4], totlen - 4)) {
+               if (!rawprint(ndo, (const uint8_t *)(p + 4), totlen - 4)) {

                        ND_PRINT((ndo,")"));
                        goto trunc;
                }
                        ND_PRINT((ndo,")"));
                        goto trunc;
                }


@@ -969,8 +969,8 @@ ikev1_attr_print(netdissect_options *ndo, const u_char *p, const u_char *ep2)
        int totlen;
        uint32_t t;
 
        int totlen;
        uint32_t t;
 

-       ND_TCHECK(p[0]);
-       if (p[0] & 0x80)
+       ND_TCHECK_1(p);
+       if (EXTRACT_U_1(p) & 0x80)

                totlen = 4;
        else {
                ND_TCHECK_2(p + 2);
                totlen = 4;
        else {
                ND_TCHECK_2(p + 2);


@@ -985,16 +985,16 @@ ikev1_attr_print(netdissect_options *ndo, const u_char *p, const u_char *ep2)
        ND_PRINT((ndo,"("));
        t = EXTRACT_BE_U_2(p) & 0x7fff;
        ND_PRINT((ndo,"type=#%d ", t));
        ND_PRINT((ndo,"("));
        t = EXTRACT_BE_U_2(p) & 0x7fff;
        ND_PRINT((ndo,"type=#%d ", t));

-       if (p[0] & 0x80) {
+       if (EXTRACT_U_1(p) & 0x80) {

                ND_PRINT((ndo,"value="));
                ND_PRINT((ndo,"value="));

-               t = p[2];
-               if (!rawprint(ndo, (const uint8_t *)&p[2], 2)) {
+               t = EXTRACT_U_1(p + 2);
+               if (!rawprint(ndo, (const uint8_t *)(p + 2), 2)) {

                        ND_PRINT((ndo,")"));
                        goto trunc;
                }
        } else {
                ND_PRINT((ndo,"len=%d value=", totlen - 4));
                        ND_PRINT((ndo,")"));
                        goto trunc;
                }
        } else {
                ND_PRINT((ndo,"len=%d value=", totlen - 4));

-               if (!rawprint(ndo, (const uint8_t *)&p[4], totlen - 4)) {
+               if (!rawprint(ndo, (const uint8_t *)(p + 4), totlen - 4)) {

                        ND_PRINT((ndo,")"));
                        goto trunc;
                }
                        ND_PRINT((ndo,")"));
                        goto trunc;
                }


@@ -1048,7 +1048,7 @@ ikev1_sa_print(netdissect_options *ndo, u_char tpay _U_,
 
        np = (const u_char *)ext + sizeof(sa);
        if (sit != 0x01) {
 
        np = (const u_char *)ext + sizeof(sa);
        if (sit != 0x01) {

-               ND_TCHECK2(*(ext + 1), sizeof(ident));
+               ND_TCHECK_LEN(ext + 1, sizeof(ident));

                UNALIGNED_MEMCPY(&ident, ext + 1, sizeof(ident));
                ND_PRINT((ndo," ident=%u", (uint32_t)ntohl(ident)));
                np += sizeof(ident);
                UNALIGNED_MEMCPY(&ident, ext + 1, sizeof(ident));
                ND_PRINT((ndo," ident=%u", (uint32_t)ntohl(ident)));
                np += sizeof(ident);


@@ -1393,7 +1393,7 @@ ikev1_id_print(netdissect_options *ndo, u_char tpay _U_,
                        break;
                if (data == NULL)
                        goto trunc;
                        break;
                if (data == NULL)
                        goto trunc;

-               ND_TCHECK2(*data, len);
+               ND_TCHECK_LEN(data, len);

                switch (doi_id.type) {
                case IPSECDOI_ID_IPV4_ADDR:
                        if (len < 4)
                switch (doi_id.type) {
                case IPSECDOI_ID_IPV4_ADDR:
                        if (len < 4)


@@ -2044,7 +2044,7 @@ ikev2_p_print(netdissect_options *ndo, u_char tpay _U_, int pcount _U_,
 
                if (prop_length < item_len)
                        goto toolong;
 
                if (prop_length < item_len)
                        goto toolong;

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

 
                depth++;
                ND_PRINT((ndo,"\n"));
 
                depth++;
                ND_PRINT((ndo,"\n"));


@@ -2130,7 +2130,7 @@ ikev2_sa_print(netdissect_options *ndo, u_char tpay,
 
                if (sa_length < item_len)
                        goto toolong;
 
                if (sa_length < item_len)
                        goto toolong;

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

 
                depth++;
                ND_PRINT((ndo,"\n"));
 
                depth++;
                ND_PRINT((ndo,"\n"));


@@ -2259,7 +2259,7 @@ ikev2_ID_print(netdissect_options *ndo, u_char tpay,
        }
 
        if(dumpascii) {
        }
 
        if(dumpascii) {

-               ND_TCHECK2(*typedata, idtype_len);
+               ND_TCHECK_LEN(typedata, idtype_len);

                for(i=0; i<idtype_len; i++) {
                        if(ND_ISPRINT(EXTRACT_U_1(typedata + i))) {
                                ND_PRINT((ndo, "%c", EXTRACT_U_1(typedata + i)));
                for(i=0; i<idtype_len; i++) {
                        if(ND_ISPRINT(EXTRACT_U_1(typedata + i))) {
                                ND_PRINT((ndo, "%c", EXTRACT_U_1(typedata + i)));


@@ -2312,7 +2312,7 @@ ikev2_auth_print(netdissect_options *ndo, u_char tpay,
        const u_char *authdata = (const u_char*)ext + sizeof(a);
        unsigned int len;
 
        const u_char *authdata = (const u_char*)ext + sizeof(a);
        unsigned int len;
 

-       ND_TCHECK2(*ext, sizeof(a));
+       ND_TCHECK_LEN(ext, sizeof(a));

        UNALIGNED_MEMCPY(&a, ext, sizeof(a));
        ikev2_pay_print(ndo, NPSTR(tpay), a.h.critical);
        len = ntohs(a.h.len);
        UNALIGNED_MEMCPY(&a, ext, sizeof(a));
        ikev2_pay_print(ndo, NPSTR(tpay), a.h.critical);
        len = ntohs(a.h.len);


@@ -2602,7 +2602,7 @@ ikev2_vid_print(netdissect_options *ndo, u_char tpay,
 
        vid = (const u_char *)(ext+1);
        len = ntohs(e.len) - 4;
 
        vid = (const u_char *)(ext+1);
        len = ntohs(e.len) - 4;

-       ND_TCHECK2(*vid, len);
+       ND_TCHECK_LEN(vid, len);

        for(i=0; i<len; i++) {
                if(ND_ISPRINT(EXTRACT_U_1(vid + i)))
                        ND_PRINT((ndo, "%c", EXTRACT_U_1(vid + i)));
        for(i=0; i<len; i++) {
                if(ND_ISPRINT(EXTRACT_U_1(vid + i)))
                        ND_PRINT((ndo, "%c", EXTRACT_U_1(vid + i)));


@@ -2674,7 +2674,7 @@ ikev2_e_print(netdissect_options *ndo,
        }
 
        dat = (const u_char *)(ext+1);
        }
 
        dat = (const u_char *)(ext+1);

-       ND_TCHECK2(*dat, dlen);
+       ND_TCHECK_LEN(dat, dlen);

 
 #ifdef HAVE_LIBCRYPTO
        /* try to decypt it! */
 
 #ifdef HAVE_LIBCRYPTO
        /* try to decypt it! */


@@ -2777,7 +2777,7 @@ ikev1_sub_print(netdissect_options *ndo,
                ND_TCHECK(*ext);
                UNALIGNED_MEMCPY(&e, ext, sizeof(e));
 
                ND_TCHECK(*ext);
                UNALIGNED_MEMCPY(&e, ext, sizeof(e));
 

-               ND_TCHECK2(*ext, ntohs(e.len));
+               ND_TCHECK_LEN(ext, ntohs(e.len));

 
                depth++;
                ND_PRINT((ndo,"\n"));
 
                depth++;
                ND_PRINT((ndo,"\n"));


@@ -2944,7 +2944,7 @@ ikev2_sub_print(netdissect_options *ndo,
                ND_TCHECK(*ext);
                UNALIGNED_MEMCPY(&e, ext, sizeof(e));
 
                ND_TCHECK(*ext);
                UNALIGNED_MEMCPY(&e, ext, sizeof(e));
 

-               ND_TCHECK2(*ext, ntohs(e.len));
+               ND_TCHECK_LEN(ext, ntohs(e.len));

 
                depth++;
                ND_PRINT((ndo,"\n"));
 
                depth++;
                ND_PRINT((ndo,"\n"));


@@ -3095,8 +3095,8 @@ isakmp_rfc3948_print(netdissect_options *ndo,
                     const u_char *bp, u_int length,
                     const u_char *bp2)
 {
                     const u_char *bp, u_int length,
                     const u_char *bp2)
 {

-       ND_TCHECK(bp[0]);
-       if(length == 1 && bp[0]==0xff) {
+       ND_TCHECK_1(bp);
+       if(length == 1 && EXTRACT_U_1(bp)==0xff) {

                ND_PRINT((ndo, "isakmp-nat-keep-alive"));
                return;
        }
                ND_PRINT((ndo, "isakmp-nat-keep-alive"));
                return;
        }


@@ -3104,12 +3104,13 @@ isakmp_rfc3948_print(netdissect_options *ndo,
        if(length < 4) {
                goto trunc;
        }
        if(length < 4) {
                goto trunc;
        }

-       ND_TCHECK(bp[3]);
+       ND_TCHECK_1(bp + 3);

 
        /*
         * see if this is an IKE packet
         */
 
        /*
         * see if this is an IKE packet
         */

-       if(bp[0]==0 && bp[1]==0 && bp[2]==0 && bp[3]==0) {
+       if (EXTRACT_U_1(bp) == 0 && EXTRACT_U_1(bp + 1) == 0 &&
+           EXTRACT_U_1(bp + 2) == 0 && EXTRACT_U_1(bp + 3) == 0) {

                ND_PRINT((ndo, "NONESP-encap: "));
                isakmp_print(ndo, bp+4, length-4, bp2);
                return;
                ND_PRINT((ndo, "NONESP-encap: "));
                isakmp_print(ndo, bp+4, length-4, bp2);
                return;