Rename EXTRACT_ macros

[tcpdump] / print-domain.c

diff --git a/print-domain.c b/print-domain.c
index 40179293db7c62a9779b799ce4413003d0cca297..95301a9ffb839f94ca31bacf95b864207584bd05 100644 (file)
--- a/print-domain.c
+++ b/print-domain.c
@@ -58,7 +58,7 @@ ns_nskip(netdissect_options *ndo,
 
        if (!ND_TTEST_1(cp))
                return (NULL);
 
        if (!ND_TTEST_1(cp))
                return (NULL);

-       i = EXTRACT_8BITS(cp);
+       i = EXTRACT_U_1(cp);

        cp++;
        while (i) {
                if ((i & INDIR_MASK) == INDIR_MASK)
        cp++;
        while (i) {
                if ((i & INDIR_MASK) == INDIR_MASK)


@@ -70,7 +70,7 @@ ns_nskip(netdissect_options *ndo,
                                return(NULL); /* unknown ELT */
                        if (!ND_TTEST_1(cp))
                                return (NULL);
                                return(NULL); /* unknown ELT */
                        if (!ND_TTEST_1(cp))
                                return (NULL);

-                       if ((bitlen = EXTRACT_8BITS(cp)) == 0)
+                       if ((bitlen = EXTRACT_U_1(cp)) == 0)

                                bitlen = 256;
                        cp++;
                        bytelen = (bitlen + 7) / 8;
                                bitlen = 256;
                        cp++;
                        bytelen = (bitlen + 7) / 8;


@@ -79,7 +79,7 @@ ns_nskip(netdissect_options *ndo,
                        cp += i;
                if (!ND_TTEST_1(cp))
                        return (NULL);
                        cp += i;
                if (!ND_TTEST_1(cp))
                        return (NULL);

-               i = EXTRACT_8BITS(cp);
+               i = EXTRACT_U_1(cp);

                cp++;
        }
        return (cp);
                cp++;
        }
        return (cp);


@@ -96,7 +96,7 @@ blabel_print(netdissect_options *ndo,
 
        if (!ND_TTEST_1(cp))
                return(NULL);
 
        if (!ND_TTEST_1(cp))
                return(NULL);

-       if ((bitlen = EXTRACT_8BITS(cp)) == 0)
+       if ((bitlen = EXTRACT_U_1(cp)) == 0)

                bitlen = 256;
        slen = (bitlen + 3) / 4;
        lim = cp + 1 + slen;
                bitlen = 256;
        slen = (bitlen + 3) / 4;
        lim = cp + 1 + slen;


@@ -109,12 +109,12 @@ blabel_print(netdissect_options *ndo,
        }
        if (b > 4) {
                ND_TCHECK(*bitp);
        }
        if (b > 4) {
                ND_TCHECK(*bitp);

-               tc = EXTRACT_8BITS(bitp);
+               tc = EXTRACT_U_1(bitp);

                bitp++;
                ND_PRINT((ndo, "%02x", tc & (0xff << (8 - b))));
        } else if (b > 0) {
                ND_TCHECK(*bitp);
                bitp++;
                ND_PRINT((ndo, "%02x", tc & (0xff << (8 - b))));
        } else if (b > 0) {
                ND_TCHECK(*bitp);

-               tc = EXTRACT_8BITS(bitp);
+               tc = EXTRACT_U_1(bitp);

                bitp++;
                ND_PRINT((ndo, "%1x", ((tc >> 4) & 0x0f) & (0x0f << (4 - b))));
        }
                bitp++;
                ND_PRINT((ndo, "%1x", ((tc >> 4) & 0x0f) & (0x0f << (4 - b))));
        }


@@ -133,7 +133,7 @@ labellen(netdissect_options *ndo,
 
        if (!ND_TTEST_1(cp))
                return(-1);
 
        if (!ND_TTEST_1(cp))
                return(-1);

-       i = EXTRACT_8BITS(cp);
+       i = EXTRACT_U_1(cp);

        if ((i & INDIR_MASK) == EDNS0_MASK) {
                int bitlen, elt;
                if ((elt = (i & ~INDIR_MASK)) != EDNS0_ELT_BITLABEL) {
        if ((i & INDIR_MASK) == EDNS0_MASK) {
                int bitlen, elt;
                if ((elt = (i & ~INDIR_MASK)) != EDNS0_ELT_BITLABEL) {


@@ -142,7 +142,7 @@ labellen(netdissect_options *ndo,
                }
                if (!ND_TTEST_1(cp + 1))
                        return(-1);
                }
                if (!ND_TTEST_1(cp + 1))
                        return(-1);

-               if ((bitlen = EXTRACT_8BITS(cp + 1)) == 0)
+               if ((bitlen = EXTRACT_U_1(cp + 1)) == 0)

                        bitlen = 256;
                return(((bitlen + 7) / 8) + 1);
        } else
                        bitlen = 256;
                return(((bitlen + 7) / 8) + 1);
        } else


@@ -164,7 +164,7 @@ ns_nprint(netdissect_options *ndo,
        if (!ND_TTEST_1(cp))
                return(NULL);
        max_offset = (u_int)(cp - bp);
        if (!ND_TTEST_1(cp))
                return(NULL);
        max_offset = (u_int)(cp - bp);

-       i = EXTRACT_8BITS(cp);
+       i = EXTRACT_U_1(cp);

        cp++;
        if ((i & INDIR_MASK) != INDIR_MASK) {
                compress = 0;
        cp++;
        if ((i & INDIR_MASK) != INDIR_MASK) {
                compress = 0;


@@ -180,7 +180,7 @@ ns_nprint(netdissect_options *ndo,
                                }
                                if (!ND_TTEST_1(cp))
                                        return(NULL);
                                }
                                if (!ND_TTEST_1(cp))
                                        return(NULL);

-                               offset = (((i << 8) | EXTRACT_8BITS(cp)) & 0x3fff);
+                               offset = (((i << 8) | EXTRACT_U_1(cp)) & 0x3fff);

                                /*
                                 * This must move backwards in the packet.
                                 * No RFC explicitly says that, but BIND's
                                /*
                                 * This must move backwards in the packet.
                                 * No RFC explicitly says that, but BIND's


@@ -201,7 +201,7 @@ ns_nprint(netdissect_options *ndo,
                                        return(NULL);
                                if (!ND_TTEST_1(cp))
                                        return(NULL);
                                        return(NULL);
                                if (!ND_TTEST_1(cp))
                                        return(NULL);

-                               i = EXTRACT_8BITS(cp);
+                               i = EXTRACT_U_1(cp);

                                cp++;
                                continue;
                        }
                                cp++;
                                continue;
                        }


@@ -228,7 +228,7 @@ ns_nprint(netdissect_options *ndo,
                                return(NULL);
                        if (!ND_TTEST_1(cp))
                                return(NULL);
                                return(NULL);
                        if (!ND_TTEST_1(cp))
                                return(NULL);

-                       i = EXTRACT_8BITS(cp);
+                       i = EXTRACT_U_1(cp);

                        cp++;
                        if (!compress)
                                rp += l + 1;
                        cp++;
                        if (!compress)
                                rp += l + 1;


@@ -247,7 +247,7 @@ ns_cprint(netdissect_options *ndo,
 
        if (!ND_TTEST_1(cp))
                return (NULL);
 
        if (!ND_TTEST_1(cp))
                return (NULL);

-       i = EXTRACT_8BITS(cp);
+       i = EXTRACT_U_1(cp);

        cp++;
        if (fn_printn(ndo, cp, i, ndo->ndo_snapend))
                return (NULL);
        cp++;
        if (fn_printn(ndo, cp, i, ndo->ndo_snapend))
                return (NULL);


@@ -342,11 +342,11 @@ ns_qprint(netdissect_options *ndo,
                return(NULL);
 
        /* print the qtype */
                return(NULL);
 
        /* print the qtype */

-       i = EXTRACT_BE_16BITS(cp);
+       i = EXTRACT_BE_U_2(cp);

        cp += 2;
        ND_PRINT((ndo, " %s", tok2str(ns_type2str, "Type%d", i)));
        /* print the qclass (if it's not IN) */
        cp += 2;
        ND_PRINT((ndo, " %s", tok2str(ns_type2str, "Type%d", i)));
        /* print the qclass (if it's not IN) */

-       i = EXTRACT_BE_16BITS(cp);
+       i = EXTRACT_BE_U_2(cp);

        cp += 2;
        if (is_mdns)
                class = (i & ~C_QU);
        cp += 2;
        if (is_mdns)
                class = (i & ~C_QU);


@@ -383,10 +383,10 @@ ns_rprint(netdissect_options *ndo,
                return (ndo->ndo_snapend);
 
        /* print the type/qtype */
                return (ndo->ndo_snapend);
 
        /* print the type/qtype */

-       typ = EXTRACT_BE_16BITS(cp);
+       typ = EXTRACT_BE_U_2(cp);

        cp += 2;
        /* print the class (if it's not IN and the type isn't OPT) */
        cp += 2;
        /* print the class (if it's not IN and the type isn't OPT) */

-       i = EXTRACT_BE_16BITS(cp);
+       i = EXTRACT_BE_U_2(cp);

        cp += 2;
        if (is_mdns)
                class = (i & ~C_CACHE_FLUSH);
        cp += 2;
        if (is_mdns)
                class = (i & ~C_CACHE_FLUSH);


@@ -402,13 +402,13 @@ ns_rprint(netdissect_options *ndo,
        if (typ == T_OPT) {
                /* get opt flags */
                cp += 2;
        if (typ == T_OPT) {
                /* get opt flags */
                cp += 2;

-               opt_flags = EXTRACT_BE_16BITS(cp);
+               opt_flags = EXTRACT_BE_U_2(cp);

                /* ignore rest of ttl field */
                cp += 2;
        } else if (ndo->ndo_vflag > 2) {
                /* print ttl */
                ND_PRINT((ndo, " ["));
                /* ignore rest of ttl field */
                cp += 2;
        } else if (ndo->ndo_vflag > 2) {
                /* print ttl */
                ND_PRINT((ndo, " ["));

-               unsigned_relts_print(ndo, EXTRACT_BE_32BITS(cp));
+               unsigned_relts_print(ndo, EXTRACT_BE_U_4(cp));

                ND_PRINT((ndo, "]"));
                cp += 4;
        } else {
                ND_PRINT((ndo, "]"));
                cp += 4;
        } else {


@@ -416,7 +416,7 @@ ns_rprint(netdissect_options *ndo,
                cp += 4;
        }
 
                cp += 4;
        }
 

-       len = EXTRACT_BE_16BITS(cp);
+       len = EXTRACT_BE_U_2(cp);

        cp += 2;
 
        rp = cp + len;
        cp += 2;
 
        rp = cp + len;


@@ -429,7 +429,7 @@ ns_rprint(netdissect_options *ndo,
        case T_A:
                if (!ND_TTEST2(*cp, sizeof(struct in_addr)))
                        return(NULL);
        case T_A:
                if (!ND_TTEST2(*cp, sizeof(struct in_addr)))
                        return(NULL);

-               ND_PRINT((ndo, " %s", intoa(htonl(EXTRACT_BE_32BITS(cp)))));
+               ND_PRINT((ndo, " %s", intoa(htonl(EXTRACT_BE_U_4(cp)))));

                break;
 
        case T_NS:
                break;
 
        case T_NS:


@@ -454,15 +454,15 @@ ns_rprint(netdissect_options *ndo,
                        return(NULL);
                if (!ND_TTEST2(*cp, 5 * 4))
                        return(NULL);
                        return(NULL);
                if (!ND_TTEST2(*cp, 5 * 4))
                        return(NULL);

-               ND_PRINT((ndo, " %u", EXTRACT_BE_32BITS(cp)));
+               ND_PRINT((ndo, " %u", EXTRACT_BE_U_4(cp)));

                cp += 4;
                cp += 4;

-               ND_PRINT((ndo, " %u", EXTRACT_BE_32BITS(cp)));
+               ND_PRINT((ndo, " %u", EXTRACT_BE_U_4(cp)));

                cp += 4;
                cp += 4;

-               ND_PRINT((ndo, " %u", EXTRACT_BE_32BITS(cp)));
+               ND_PRINT((ndo, " %u", EXTRACT_BE_U_4(cp)));

                cp += 4;
                cp += 4;

-               ND_PRINT((ndo, " %u", EXTRACT_BE_32BITS(cp)));
+               ND_PRINT((ndo, " %u", EXTRACT_BE_U_4(cp)));

                cp += 4;
                cp += 4;

-               ND_PRINT((ndo, " %u", EXTRACT_BE_32BITS(cp)));
+               ND_PRINT((ndo, " %u", EXTRACT_BE_U_4(cp)));

                cp += 4;
                break;
        case T_MX:
                cp += 4;
                break;
        case T_MX:


@@ -471,7 +471,7 @@ ns_rprint(netdissect_options *ndo,
                        return(NULL);
                if (ns_nprint(ndo, cp + 2, bp) == NULL)
                        return(NULL);
                        return(NULL);
                if (ns_nprint(ndo, cp + 2, bp) == NULL)
                        return(NULL);

-               ND_PRINT((ndo, " %d", EXTRACT_BE_16BITS(cp)));
+               ND_PRINT((ndo, " %d", EXTRACT_BE_U_2(cp)));

                break;
 
        case T_TXT:
                break;
 
        case T_TXT:


@@ -490,8 +490,8 @@ ns_rprint(netdissect_options *ndo,
                        return(NULL);
                if (ns_nprint(ndo, cp + 6, bp) == NULL)
                        return(NULL);
                        return(NULL);
                if (ns_nprint(ndo, cp + 6, bp) == NULL)
                        return(NULL);

-               ND_PRINT((ndo, ":%d %d %d", EXTRACT_BE_16BITS(cp + 4),
-                         EXTRACT_BE_16BITS(cp), EXTRACT_BE_16BITS(cp + 2)));
+               ND_PRINT((ndo, ":%d %d %d", EXTRACT_BE_U_2(cp + 4),
+                         EXTRACT_BE_U_2(cp), EXTRACT_BE_U_2(cp + 2)));

                break;
 
        case T_AAAA:
                break;
 
        case T_AAAA:


@@ -514,7 +514,7 @@ ns_rprint(netdissect_options *ndo,
 
                if (!ND_TTEST_1(cp))
                        return(NULL);
 
                if (!ND_TTEST_1(cp))
                        return(NULL);

-               pbit = EXTRACT_8BITS(cp);
+               pbit = EXTRACT_U_1(cp);

                pbyte = (pbit & ~7) / 8;
                if (pbit > 128) {
                        ND_PRINT((ndo, " %u(bad plen)", pbit));
                pbyte = (pbit & ~7) / 8;
                if (pbit > 128) {
                        ND_PRINT((ndo, " %u(bad plen)", pbit));


@@ -560,23 +560,23 @@ ns_rprint(netdissect_options *ndo,
                cp += 6;
                if (!ND_TTEST_2(cp))
                        return(NULL);
                cp += 6;
                if (!ND_TTEST_2(cp))
                        return(NULL);

-               ND_PRINT((ndo, " fudge=%u", EXTRACT_BE_16BITS(cp)));
+               ND_PRINT((ndo, " fudge=%u", EXTRACT_BE_U_2(cp)));

                cp += 2;
                if (!ND_TTEST_2(cp))
                        return(NULL);
                cp += 2;
                if (!ND_TTEST_2(cp))
                        return(NULL);

-               ND_PRINT((ndo, " maclen=%u", EXTRACT_BE_16BITS(cp)));
-               cp += 2 + EXTRACT_BE_16BITS(cp);
+               ND_PRINT((ndo, " maclen=%u", EXTRACT_BE_U_2(cp)));
+               cp += 2 + EXTRACT_BE_U_2(cp);

                if (!ND_TTEST_2(cp))
                        return(NULL);
                if (!ND_TTEST_2(cp))
                        return(NULL);

-               ND_PRINT((ndo, " origid=%u", EXTRACT_BE_16BITS(cp)));
+               ND_PRINT((ndo, " origid=%u", EXTRACT_BE_U_2(cp)));

                cp += 2;
                if (!ND_TTEST_2(cp))
                        return(NULL);
                cp += 2;
                if (!ND_TTEST_2(cp))
                        return(NULL);

-               ND_PRINT((ndo, " error=%u", EXTRACT_BE_16BITS(cp)));
+               ND_PRINT((ndo, " error=%u", EXTRACT_BE_U_2(cp)));

                cp += 2;
                if (!ND_TTEST_2(cp))
                        return(NULL);
                cp += 2;
                if (!ND_TTEST_2(cp))
                        return(NULL);

-               ND_PRINT((ndo, " otherlen=%u", EXTRACT_BE_16BITS(cp)));
+               ND_PRINT((ndo, " otherlen=%u", EXTRACT_BE_U_2(cp)));

                cp += 2;
            }
        }
                cp += 2;
            }
        }


@@ -595,15 +595,15 @@ domain_print(netdissect_options *ndo,
        np = (const HEADER *)bp;
        ND_TCHECK(*np);
        /* get the byte-order right */
        np = (const HEADER *)bp;
        ND_TCHECK(*np);
        /* get the byte-order right */

-       qdcount = EXTRACT_BE_16BITS(&np->qdcount);
-       ancount = EXTRACT_BE_16BITS(&np->ancount);
-       nscount = EXTRACT_BE_16BITS(&np->nscount);
-       arcount = EXTRACT_BE_16BITS(&np->arcount);
+       qdcount = EXTRACT_BE_U_2(&np->qdcount);
+       ancount = EXTRACT_BE_U_2(&np->ancount);
+       nscount = EXTRACT_BE_U_2(&np->nscount);
+       arcount = EXTRACT_BE_U_2(&np->arcount);

 
        if (DNS_QR(np)) {
                /* this is a response */
                ND_PRINT((ndo, "%d%s%s%s%s%s%s",
 
        if (DNS_QR(np)) {
                /* this is a response */
                ND_PRINT((ndo, "%d%s%s%s%s%s%s",

-                       EXTRACT_BE_16BITS(&np->id),
+                       EXTRACT_BE_U_2(&np->id),

                        ns_ops[DNS_OPCODE(np)],
                        ns_resp[DNS_RCODE(np)],
                        DNS_AA(np)? "*" : "",
                        ns_ops[DNS_OPCODE(np)],
                        ns_resp[DNS_RCODE(np)],
                        DNS_AA(np)? "*" : "",


@@ -616,7 +616,7 @@ domain_print(netdissect_options *ndo,
                /* Print QUESTION section on -vv */
                cp = (const u_char *)(np + 1);
                while (qdcount--) {
                /* Print QUESTION section on -vv */
                cp = (const u_char *)(np + 1);
                while (qdcount--) {

-                       if (qdcount < EXTRACT_BE_16BITS(&np->qdcount) - 1)
+                       if (qdcount < EXTRACT_BE_U_2(&np->qdcount) - 1)

                                ND_PRINT((ndo, ","));
                        if (ndo->ndo_vflag > 1) {
                                ND_PRINT((ndo, " q:"));
                                ND_PRINT((ndo, ","));
                        if (ndo->ndo_vflag > 1) {
                                ND_PRINT((ndo, " q:"));


@@ -670,12 +670,12 @@ domain_print(netdissect_options *ndo,
        }
        else {
                /* this is a request */
        }
        else {
                /* this is a request */

-               ND_PRINT((ndo, "%d%s%s%s", EXTRACT_BE_16BITS(&np->id), ns_ops[DNS_OPCODE(np)],
+               ND_PRINT((ndo, "%d%s%s%s", EXTRACT_BE_U_2(&np->id), ns_ops[DNS_OPCODE(np)],

                          DNS_RD(np) ? "+" : "",
                          DNS_CD(np) ? "%" : ""));
 
                /* any weirdness? */
                          DNS_RD(np) ? "+" : "",
                          DNS_CD(np) ? "%" : ""));
 
                /* any weirdness? */

-               b2 = EXTRACT_BE_16BITS(((const u_short *)np) + 1);
+               b2 = EXTRACT_BE_U_2(((const u_short *)np) + 1);

                if (b2 & 0x6cf)
                        ND_PRINT((ndo, " [b2&3=0x%x]", b2));
 
                if (b2 & 0x6cf)
                        ND_PRINT((ndo, " [b2&3=0x%x]", b2));