Use more the ND_TTEST_1() macro

[tcpdump] / print-cdp.c

diff --git a/print-cdp.c b/print-cdp.c
index 586a5ec8ecbd50985158dff09d869d3e41c42cc1..bf8262656003201db9e73fa6fdfd43ebf6a6c9c3 100644 (file)
--- a/print-cdp.c
+++ b/print-cdp.c
@@ -104,17 +104,17 @@ cdp_print(netdissect_options *ndo,
 
        tptr = pptr; /* temporary pointer */
 
-       ND_TCHECK2(*tptr, CDP_HEADER_LEN);
-       ND_PRINT((ndo, "CDPv%u, ttl: %us", EXTRACT_8BITS((tptr + CDP_HEADER_VERSION_OFFSET)),
-                                          *(tptr + CDP_HEADER_TTL_OFFSET)));
+       ND_TCHECK_LEN(tptr, CDP_HEADER_LEN);
+       ND_PRINT((ndo, "CDPv%u, ttl: %us", EXTRACT_U_1((tptr + CDP_HEADER_VERSION_OFFSET)),
+                                          EXTRACT_U_1(tptr + CDP_HEADER_TTL_OFFSET)));
        if (ndo->ndo_vflag)
-               ND_PRINT((ndo, ", checksum: 0x%04x (unverified), length %u", EXTRACT_BE_16BITS(tptr + CDP_HEADER_CHECKSUM_OFFSET), length));
+               ND_PRINT((ndo, ", checksum: 0x%04x (unverified), length %u", EXTRACT_BE_U_2(tptr + CDP_HEADER_CHECKSUM_OFFSET), length));
        tptr += CDP_HEADER_LEN;
 
        while (tptr < (pptr+length)) {
-               ND_TCHECK2(*tptr, CDP_TLV_HEADER_LEN); /* read out Type and Length */
-               type = EXTRACT_BE_16BITS(tptr + CDP_TLV_TYPE_OFFSET);
-               len  = EXTRACT_BE_16BITS(tptr + CDP_TLV_LEN_OFFSET); /* object length includes the 4 bytes header length */
+               ND_TCHECK_LEN(tptr, CDP_TLV_HEADER_LEN); /* read out Type and Length */
+               type = EXTRACT_BE_U_2(tptr + CDP_TLV_TYPE_OFFSET);
+               len  = EXTRACT_BE_U_2(tptr + CDP_TLV_LEN_OFFSET); /* object length includes the 4 bytes header length */
                if (len < CDP_TLV_HEADER_LEN) {
                    if (ndo->ndo_vflag)
                        ND_PRINT((ndo, "\n\t%s (0x%02x), TLV length: %u byte%s (too short)",
@@ -131,7 +131,7 @@ cdp_print(netdissect_options *ndo,
                tptr += CDP_TLV_HEADER_LEN;
                len -= CDP_TLV_HEADER_LEN;
 
-               ND_TCHECK2(*tptr, len);
+               ND_TCHECK_LEN(tptr, len);
 
                if (ndo->ndo_vflag || type == 1) { /* in non-verbose mode just print Device-ID */
 
@@ -164,13 +164,13 @@ cdp_print(netdissect_options *ndo,
                        if (len < 4)
                            goto trunc;
                        ND_PRINT((ndo, "(0x%08x): %s",
-                              EXTRACT_BE_32BITS(tptr),
-                              bittok2str(cdp_capability_values, "none", EXTRACT_BE_32BITS(tptr))));
+                              EXTRACT_BE_U_4(tptr),
+                              bittok2str(cdp_capability_values, "none", EXTRACT_BE_U_4(tptr))));
                        break;
                    case 0x05: /* Version */
                        ND_PRINT((ndo, "\n\t  "));
                        for (i=0;i<len;i++) {
-                           j = EXTRACT_8BITS(tptr + i);
+                           j = EXTRACT_U_1(tptr + i);
                            if (j == '\n') /* lets rework the version string to
                                              get a nice indentation */
                                ND_PRINT((ndo, "\n\t  "));
@@ -197,12 +197,12 @@ cdp_print(netdissect_options *ndo,
                    case 0x0a: /* Native VLAN ID - CDPv2 */
                        if (len < 2)
                            goto trunc;
-                       ND_PRINT((ndo, "%d", EXTRACT_BE_16BITS(tptr)));
+                       ND_PRINT((ndo, "%d", EXTRACT_BE_U_2(tptr)));
                        break;
                    case 0x0b: /* Duplex - CDPv2 */
                        if (len < 1)
                            goto trunc;
-                       ND_PRINT((ndo, "%s", *(tptr) ? "full": "half"));
+                       ND_PRINT((ndo, "%s", EXTRACT_U_1(tptr) ? "full": "half"));
                        break;
 
                    /* http://www.cisco.com/c/en/us/td/docs/voice_ip_comm/cata/186/2_12_m/english/release/notes/186rn21m.html
@@ -211,7 +211,7 @@ cdp_print(netdissect_options *ndo,
                    case 0x0e: /* ATA-186 VoIP VLAN request - incomplete doc. */
                        if (len < 3)
                            goto trunc;
-                       ND_PRINT((ndo, "app %d, vlan %d", EXTRACT_8BITS((tptr)), EXTRACT_BE_16BITS(tptr + 1)));
+                       ND_PRINT((ndo, "app %d, vlan %d", EXTRACT_U_1((tptr)), EXTRACT_BE_U_2(tptr + 1)));
                        break;
                    case 0x10: /* ATA-186 VoIP VLAN assignment - incomplete doc. */
                        ND_PRINT((ndo, "%1.2fW", cdp_get_number(tptr, len) / 1000.0));
@@ -219,17 +219,17 @@ cdp_print(netdissect_options *ndo,
                    case 0x11: /* MTU - not documented */
                        if (len < 4)
                            goto trunc;
-                       ND_PRINT((ndo, "%u bytes", EXTRACT_BE_32BITS(tptr)));
+                       ND_PRINT((ndo, "%u bytes", EXTRACT_BE_U_4(tptr)));
                        break;
                    case 0x12: /* AVVID trust bitmap - not documented */
                        if (len < 1)
                            goto trunc;
-                       ND_PRINT((ndo, "0x%02x", *(tptr)));
+                       ND_PRINT((ndo, "0x%02x", EXTRACT_U_1(tptr)));
                        break;
                    case 0x13: /* AVVID untrusted port CoS - not documented */
                        if (len < 1)
                            goto trunc;
-                       ND_PRINT((ndo, "0x%02x", *(tptr)));
+                       ND_PRINT((ndo, "0x%02x", EXTRACT_U_1(tptr)));
                        break;
                    case 0x14: /* System Name - not documented */
                        ND_PRINT((ndo, "'"));
@@ -243,7 +243,7 @@ cdp_print(netdissect_options *ndo,
                    case 0x17: /* Physical Location - not documented */
                        if (len < 1)
                            goto trunc;
-                       ND_PRINT((ndo, "0x%02x", *(tptr)));
+                       ND_PRINT((ndo, "0x%02x", EXTRACT_U_1(tptr)));
                        if (len > 1) {
                                ND_PRINT((ndo, "/"));
                                (void)fn_printn(ndo, tptr + 1, len - 1, NULL);
@@ -285,26 +285,27 @@ cdp_print_addr(netdissect_options *ndo,
                0xaa, 0xaa, 0x03, 0x00, 0x00, 0x00, 0x86, 0xdd
        };
 
-       ND_TCHECK2(*p, 4);
+       ND_TCHECK_4(p);
        if (p + 4 > endp)
                goto trunc;
-       num = EXTRACT_BE_32BITS(p);
+       num = EXTRACT_BE_U_4(p);
        p += 4;
 
        while (p < endp && num >= 0) {
-               ND_TCHECK2(*p, 2);
+               ND_TCHECK_2(p);
                if (p + 2 > endp)
                        goto trunc;
-               pt = p[0];              /* type of "protocol" field */
-               pl = p[1];              /* length of "protocol" field */
+               pt = EXTRACT_U_1(p);            /* type of "protocol" field */
+               pl = EXTRACT_U_1(p + 1);                /* length of "protocol" field */
                p += 2;
 
-               ND_TCHECK2(p[pl], 2);
+               ND_TCHECK_2(p + pl);
                if (p + pl + 2 > endp)
                        goto trunc;
-               al = EXTRACT_BE_16BITS(p + pl); /* address length */
+               al = EXTRACT_BE_U_2(p + pl);    /* address length */
 
-               if (pt == PT_NLPID && pl == 1 && *p == NLPID_IP && al == 4) {
+               if (pt == PT_NLPID && pl == 1 && EXTRACT_U_1(p) == NLPID_IP &&
+                   al == 4) {
                        /*
                         * IPv4: protocol type = NLPID, protocol length = 1
                         * (1-byte NLPID), protocol = 0xcc (NLPID for IPv4),
@@ -312,7 +313,7 @@ cdp_print_addr(netdissect_options *ndo,
                         */
                        p += 3;
 
-                       ND_TCHECK2(*p, 4);
+                       ND_TCHECK_4(p);
                        if (p + 4 > endp)
                                goto trunc;
                        ND_PRINT((ndo, "IPv4 (%u) %s", num, ipaddr_string(ndo, p)));
@@ -327,7 +328,7 @@ cdp_print_addr(netdissect_options *ndo,
                         * Ethertype, address length = 16
                         */
                        p += 10;
-                       ND_TCHECK2(*p, al);
+                       ND_TCHECK_LEN(p, al);
                        if (p + al > endp)
                                goto trunc;
 
@@ -338,24 +339,24 @@ cdp_print_addr(netdissect_options *ndo,
                        /*
                         * Generic case: just print raw data
                         */
-                       ND_TCHECK2(*p, pl);
+                       ND_TCHECK_LEN(p, pl);
                        if (p + pl > endp)
                                goto trunc;
-                       ND_PRINT((ndo, "pt=0x%02x, pl=%d, pb=", EXTRACT_8BITS((p - 2)), pl));
+                       ND_PRINT((ndo, "pt=0x%02x, pl=%d, pb=", EXTRACT_U_1((p - 2)), pl));
                        while (pl-- > 0) {
-                               ND_PRINT((ndo, " %02x", EXTRACT_8BITS(p)));
+                               ND_PRINT((ndo, " %02x", EXTRACT_U_1(p)));
                                p++;
                        }
-                       ND_TCHECK2(*p, 2);
+                       ND_TCHECK_2(p);
                        if (p + 2 > endp)
                                goto trunc;
                        ND_PRINT((ndo, ", al=%d, a=", al));
                        p += 2;
-                       ND_TCHECK2(*p, al);
+                       ND_TCHECK_LEN(p, al);
                        if (p + al > endp)
                                goto trunc;
                        while (al-- > 0) {
-                               ND_PRINT((ndo, " %02x", EXTRACT_8BITS(p)));
+                               ND_PRINT((ndo, " %02x", EXTRACT_U_1(p)));
                                p++;
                        }
                }
@@ -381,7 +382,9 @@ cdp_print_prefixes(netdissect_options *ndo,
        ND_PRINT((ndo, " IPv4 Prefixes (%d):", l / 5));
 
        while (l > 0) {
-               ND_PRINT((ndo, " %u.%u.%u.%u/%u", p[0], p[1], p[2], p[3], p[4]));
+               ND_PRINT((ndo, " %u.%u.%u.%u/%u",
+                         EXTRACT_U_1(p), EXTRACT_U_1(p + 1), EXTRACT_U_1(p + 2),
+                         EXTRACT_U_1(p + 3), EXTRACT_U_1(p + 4)));
                l -= 5;
                p += 5;
        }
@@ -400,7 +403,7 @@ static unsigned long cdp_get_number(const u_char * p, int l)
     unsigned long res=0;
     while( l>0 )
     {
-       res = (res<<8) + EXTRACT_8BITS(p);
+       res = (res<<8) + EXTRACT_U_1(p);
        p++; l--;
     }
     return res;