]> The Tcpdump Group git mirrors - tcpdump/blobdiff - print-domain.c
projects / tcpdump / blobdiff
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
Use more the EXTRACT_U_1() macro (40/n)
[tcpdump] / print-domain.c
diff --git a/print-domain.c b/print-domain.c
index 5a67d214cde7ec3e8c13f835cddfec1119ae61ce..e150116d84eb8583e346fe08a1757c5dd6e490bf 100644 (file)
--- a/print-domain.c
+++ b/print-domain.c
@@ -19,29 +19,26 @@
  * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  */
 
  * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  */
 
-#ifndef lint
-static const char rcsid[] _U_ =
-    "@(#) $Header: /tcpdump/master/tcpdump/print-domain.c,v 1.88 2003-11-16 09:36:18 guy Exp $ (LBL)";
-#endif
+/* \summary: Domain Name System (DNS) printer */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
 
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
 
-#include <tcpdump-stdinc.h>
+#include <netdissect-stdinc.h>
 
 #include "nameser.h"
 
 
 #include "nameser.h"
 
-#include <stdio.h>
 #include <string.h>
 
 #include <string.h>
 
-#include "interface.h"
+#include "netdissect.h"
 #include "addrtoname.h"
 #include "addrtoname.h"
-#include "extract.h"                    /* must come after interface.h */
+#include "addrtostr.h"
+#include "extract.h"
 
 static const char *ns_ops[] = {
        "", " inv_q", " stat", " op3", " notify", " update", " op6", " op7",
 
 static const char *ns_ops[] = {
        "", " inv_q", " stat", " op3", " notify", " update", " op6", " op7",
-       " op8", " updataA", " updateD", " updateDA",
+       " op8", " updateA", " updateD", " updateDA",
        " updateM", " updateMA", " zoneInit", " zoneRef",
 };
 
        " updateM", " updateMA", " zoneInit", " zoneRef",
 };
 
@@ -54,13 +51,15 @@ static const char *ns_resp[] = {
 
 /* skip over a domain name */
 static const u_char *
 
 /* skip over a domain name */
 static const u_char *
-ns_nskip(register const u_char *cp)
+ns_nskip(netdissect_options *ndo,
+         register const u_char *cp)
 {
        register u_char i;
 
 {
        register u_char i;
 
-       if (!TTEST2(*cp, 1))
+       if (!ND_TTEST_1(cp))
                return (NULL);
                return (NULL);
-       i = *cp++;
+       i = EXTRACT_U_1(cp);
+       cp++;
        while (i) {
                if ((i & INDIR_MASK) == INDIR_MASK)
                        return (cp + 1);
        while (i) {
                if ((i & INDIR_MASK) == INDIR_MASK)
                        return (cp + 1);
@@ -69,179 +68,194 @@ ns_nskip(register const u_char *cp)
 
                        if ((i & ~INDIR_MASK) != EDNS0_ELT_BITLABEL)
                                return(NULL); /* unknown ELT */
 
                        if ((i & ~INDIR_MASK) != EDNS0_ELT_BITLABEL)
                                return(NULL); /* unknown ELT */
-                       if (!TTEST2(*cp, 1))
+                       if (!ND_TTEST_1(cp))
                                return (NULL);
                                return (NULL);
-                       if ((bitlen = *cp++) == 0)
+                       if ((bitlen = EXTRACT_U_1(cp)) == 0)
                                bitlen = 256;
                                bitlen = 256;
+                       cp++;
                        bytelen = (bitlen + 7) / 8;
                        cp += bytelen;
                } else
                        cp += i;
                        bytelen = (bitlen + 7) / 8;
                        cp += bytelen;
                } else
                        cp += i;
-               if (!TTEST2(*cp, 1))
+               if (!ND_TTEST_1(cp))
                        return (NULL);
                        return (NULL);
-               i = *cp++;
+               i = EXTRACT_U_1(cp);
+               cp++;
        }
        return (cp);
 }
 
 /* print a <domain-name> */
 static const u_char *
        }
        return (cp);
 }
 
 /* print a <domain-name> */
 static const u_char *
-blabel_print(const u_char *cp)
+blabel_print(netdissect_options *ndo,
+             const u_char *cp)
 {
        int bitlen, slen, b;
 {
        int bitlen, slen, b;
-       int truncated = 0;
        const u_char *bitp, *lim;
        char tc;
 
        const u_char *bitp, *lim;
        char tc;
 
-       if (!TTEST2(*cp, 1))
+       if (!ND_TTEST_1(cp))
                return(NULL);
                return(NULL);
-       if ((bitlen = *cp) == 0)
+       if ((bitlen = EXTRACT_U_1(cp)) == 0)
                bitlen = 256;
        slen = (bitlen + 3) / 4;
                bitlen = 256;
        slen = (bitlen + 3) / 4;
-       if ((lim = cp + 1 + slen) > snapend) {
-               truncated = 1;
-               lim = snapend;
-       }
+       lim = cp + 1 + slen;
 
        /* print the bit string as a hex string */
 
        /* print the bit string as a hex string */
-       printf("\\[x");
-       for (bitp = cp + 1, b = bitlen; bitp < lim && b > 7; b -= 8, bitp++)
-               printf("%02x", *bitp);
-       if (bitp == lim)
-               printf("...");
-       else if (b > 4) {
-               tc = *bitp++;
-               printf("%02x", tc & (0xff << (8 - b)));
+       ND_PRINT((ndo, "\\[x"));
+       for (bitp = cp + 1, b = bitlen; bitp < lim && b > 7; b -= 8, bitp++) {
+               ND_TCHECK(*bitp);
+               ND_PRINT((ndo, "%02x", EXTRACT_U_1(bitp)));
+       }
+       if (b > 4) {
+               ND_TCHECK(*bitp);
+               tc = EXTRACT_U_1(bitp);
+               bitp++;
+               ND_PRINT((ndo, "%02x", tc & (0xff << (8 - b))));
        } else if (b > 0) {
        } else if (b > 0) {
-               tc = *bitp++;
-               printf("%1x", ((tc >> 4) & 0x0f) & (0x0f << (4 - b)));
+               ND_TCHECK(*bitp);
+               tc = EXTRACT_U_1(bitp);
+               bitp++;
+               ND_PRINT((ndo, "%1x", ((tc >> 4) & 0x0f) & (0x0f << (4 - b))));
        }
        }
-       printf("/%d]", bitlen);
-
-       return(truncated ? NULL : lim);
+       ND_PRINT((ndo, "/%d]", bitlen));
+       return lim;
+trunc:
+       ND_PRINT((ndo, ".../%d]", bitlen));
+       return NULL;
 }
 
 static int
 }
 
 static int
-labellen(const u_char *cp)
+labellen(netdissect_options *ndo,
+         const u_char *cp)
 {
        register u_int i;
 
 {
        register u_int i;
 
-       if (!TTEST2(*cp, 1))
+       if (!ND_TTEST_1(cp))
                return(-1);
                return(-1);
-       i = *cp;
+       i = EXTRACT_U_1(cp);
        if ((i & INDIR_MASK) == EDNS0_MASK) {
                int bitlen, elt;
        if ((i & INDIR_MASK) == EDNS0_MASK) {
                int bitlen, elt;
-
-               if ((elt = (i & ~INDIR_MASK)) != EDNS0_ELT_BITLABEL)
+               if ((elt = (i & ~INDIR_MASK)) != EDNS0_ELT_BITLABEL) {
+                       ND_PRINT((ndo, "<ELT %d>", elt));
                        return(-1);
                        return(-1);
-               if (!TTEST2(*(cp + 1), 1))
+               }
+               if (!ND_TTEST_1(cp + 1))
                        return(-1);
                        return(-1);
-               if ((bitlen = *(cp + 1)) == 0)
+               if ((bitlen = EXTRACT_U_1(cp + 1)) == 0)
                        bitlen = 256;
                return(((bitlen + 7) / 8) + 1);
        } else
                return(i);
 }
 
                        bitlen = 256;
                return(((bitlen + 7) / 8) + 1);
        } else
                return(i);
 }
 
-static const u_char *
-ns_nprint(register const u_char *cp, register const u_char *bp)
+const u_char *
+ns_nprint(netdissect_options *ndo,
+          register const u_char *cp, register const u_char *bp)
 {
        register u_int i, l;
        register const u_char *rp = NULL;
        register int compress = 0;
 {
        register u_int i, l;
        register const u_char *rp = NULL;
        register int compress = 0;
-       int chars_processed;
        int elt;
        int elt;
-       int data_size = snapend - bp;
+       u_int offset, max_offset;
 
 
-       if ((l = labellen(cp)) == (u_int)-1)
+       if ((l = labellen(ndo, cp)) == (u_int)-1)
                return(NULL);
                return(NULL);
-       if (!TTEST2(*cp, 1))
+       if (!ND_TTEST_1(cp))
                return(NULL);
                return(NULL);
-       chars_processed = 1;
-       if (((i = *cp++) & INDIR_MASK) != INDIR_MASK) {
+       max_offset = (u_int)(cp - bp);
+       i = EXTRACT_U_1(cp);
+       cp++;
+       if ((i & INDIR_MASK) != INDIR_MASK) {
                compress = 0;
                rp = cp + l;
        }
 
        if (i != 0)
                compress = 0;
                rp = cp + l;
        }
 
        if (i != 0)
-               while (i && cp < snapend) {
+               while (i && cp < ndo->ndo_snapend) {
                        if ((i & INDIR_MASK) == INDIR_MASK) {
                                if (!compress) {
                                        rp = cp + 1;
                                        compress = 1;
                                }
                        if ((i & INDIR_MASK) == INDIR_MASK) {
                                if (!compress) {
                                        rp = cp + 1;
                                        compress = 1;
                                }
-                               if (!TTEST2(*cp, 1))
+                               if (!ND_TTEST_1(cp))
                                        return(NULL);
                                        return(NULL);
-                               cp = bp + (((i << 8) | *cp) & 0x3fff);
-                               if ((l = labellen(cp)) == (u_int)-1)
-                                       return(NULL);
-                               if (!TTEST2(*cp, 1))
-                                       return(NULL);
-                               i = *cp++;
-                               chars_processed++;
-
+                               offset = (((i << 8) | EXTRACT_U_1(cp)) & 0x3fff);
                                /*
                                /*
-                                * If we've looked at every character in
-                                * the message, this pointer will make
-                                * us look at some character again,
-                                * which means we're looping.
+                                * This must move backwards in the packet.
+                                * No RFC explicitly says that, but BIND's
+                                * name decompression code requires it,
+                                * as a way of preventing infinite loops
+                                * and other bad behavior, and it's probably
+                                * what was intended (compress by pointing
+                                * to domain name suffixes already seen in
+                                * the packet).
                                 */
                                 */
-                               if (chars_processed >= data_size) {
-                                       printf("<LOOP>");
-                                       return (NULL);
+                               if (offset >= max_offset) {
+                                       ND_PRINT((ndo, "<BAD PTR>"));
+                                       return(NULL);
                                }
                                }
+                               max_offset = offset;
+                               cp = bp + offset;
+                               if ((l = labellen(ndo, cp)) == (u_int)-1)
+                                       return(NULL);
+                               if (!ND_TTEST_1(cp))
+                                       return(NULL);
+                               i = EXTRACT_U_1(cp);
+                               cp++;
                                continue;
                        }
                        if ((i & INDIR_MASK) == EDNS0_MASK) {
                                elt = (i & ~INDIR_MASK);
                                switch(elt) {
                                case EDNS0_ELT_BITLABEL:
                                continue;
                        }
                        if ((i & INDIR_MASK) == EDNS0_MASK) {
                                elt = (i & ~INDIR_MASK);
                                switch(elt) {
                                case EDNS0_ELT_BITLABEL:
-                                       if (blabel_print(cp) == NULL)
+                                       if (blabel_print(ndo, cp) == NULL)
                                                return (NULL);
                                        break;
                                default:
                                        /* unknown ELT */
                                                return (NULL);
                                        break;
                                default:
                                        /* unknown ELT */
-                                       printf("<ELT %d>", elt);
+                                       ND_PRINT((ndo, "<ELT %d>", elt));
                                        return(NULL);
                                }
                        } else {
                                        return(NULL);
                                }
                        } else {
-                               if (fn_printn(cp, l, snapend))
+                               if (fn_printn(ndo, cp, l, ndo->ndo_snapend))
                                        return(NULL);
                        }
 
                        cp += l;
                                        return(NULL);
                        }
 
                        cp += l;
-                       chars_processed += l;
-                       putchar('.');
-                       if ((l = labellen(cp)) == (u_int)-1)
+                       ND_PRINT((ndo, "."));
+                       if ((l = labellen(ndo, cp)) == (u_int)-1)
                                return(NULL);
                                return(NULL);
-                       if (!TTEST2(*cp, 1))
+                       if (!ND_TTEST_1(cp))
                                return(NULL);
                                return(NULL);
-                       i = *cp++;
-                       chars_processed++;
+                       i = EXTRACT_U_1(cp);
+                       cp++;
                        if (!compress)
                                rp += l + 1;
                }
        else
                        if (!compress)
                                rp += l + 1;
                }
        else
-               putchar('.');
+               ND_PRINT((ndo, "."));
        return (rp);
 }
 
 /* print a <character-string> */
 static const u_char *
        return (rp);
 }
 
 /* print a <character-string> */
 static const u_char *
-ns_cprint(register const u_char *cp)
+ns_cprint(netdissect_options *ndo,
+          register const u_char *cp)
 {
        register u_int i;
 
 {
        register u_int i;
 
-       if (!TTEST2(*cp, 1))
+       if (!ND_TTEST_1(cp))
                return (NULL);
                return (NULL);
-       i = *cp++;
-       if (fn_printn(cp, i, snapend))
+       i = EXTRACT_U_1(cp);
+       cp++;
+       if (fn_printn(ndo, cp, i, ndo->ndo_snapend))
                return (NULL);
        return (cp + i);
 }
 
 /* http://www.iana.org/assignments/dns-parameters */
                return (NULL);
        return (cp + i);
 }
 
 /* http://www.iana.org/assignments/dns-parameters */
-struct tok ns_type2str[] = {
+const struct tok ns_type2str[] = {
        { T_A,          "A" },                  /* RFC 1035 */
        { T_NS,         "NS" },                 /* RFC 1035 */
        { T_MD,         "MD" },                 /* RFC 1035 */
        { T_A,          "A" },                  /* RFC 1035 */
        { T_NS,         "NS" },                 /* RFC 1035 */
        { T_MD,         "MD" },                 /* RFC 1035 */
@@ -277,9 +291,20 @@ struct tok ns_type2str[] = {
        { T_SRV,        "SRV" },                /* RFC 2782 */
        { T_ATMA,       "ATMA" },               /* ATM Forum */
        { T_NAPTR,      "NAPTR" },              /* RFC 2168, RFC 2915 */
        { T_SRV,        "SRV" },                /* RFC 2782 */
        { T_ATMA,       "ATMA" },               /* ATM Forum */
        { T_NAPTR,      "NAPTR" },              /* RFC 2168, RFC 2915 */
+       { T_KX,         "KX" },                 /* RFC 2230 */
+       { T_CERT,       "CERT" },               /* RFC 2538 */
        { T_A6,         "A6" },                 /* RFC 2874 */
        { T_DNAME,      "DNAME" },              /* RFC 2672 */
        { T_A6,         "A6" },                 /* RFC 2874 */
        { T_DNAME,      "DNAME" },              /* RFC 2672 */
+       { T_SINK,       "SINK" },
        { T_OPT,        "OPT" },                /* RFC 2671 */
        { T_OPT,        "OPT" },                /* RFC 2671 */
+       { T_APL,        "APL" },                /* RFC 3123 */
+       { T_DS,         "DS" },                 /* RFC 4034 */
+       { T_SSHFP,      "SSHFP" },              /* RFC 4255 */
+       { T_IPSECKEY,   "IPSECKEY" },           /* RFC 4025 */
+       { T_RRSIG,      "RRSIG" },              /* RFC 4034 */
+       { T_NSEC,       "NSEC" },               /* RFC 4034 */
+       { T_DNSKEY,     "DNSKEY" },             /* RFC 4034 */
+       { T_SPF,        "SPF" },                /* RFC-schlitt-spf-classic-02.txt */
        { T_UINFO,      "UINFO" },
        { T_UID,        "UID" },
        { T_GID,        "GID" },
        { T_UINFO,      "UINFO" },
        { T_UID,        "UID" },
        { T_GID,        "GID" },
@@ -295,7 +320,7 @@ struct tok ns_type2str[] = {
        { 0,            NULL }
 };
 
        { 0,            NULL }
 };
 
-struct tok ns_class2str[] = {
+const struct tok ns_class2str[] = {
        { C_IN,         "IN" },         /* Not used */
        { C_CHAOS,      "CHAOS" },
        { C_HS,         "HS" },
        { C_IN,         "IN" },         /* Not used */
        { C_CHAOS,      "CHAOS" },
        { C_HS,         "HS" },
@@ -305,77 +330,106 @@ struct tok ns_class2str[] = {
 
 /* print a query */
 static const u_char *
 
 /* print a query */
 static const u_char *
-ns_qprint(register const u_char *cp, register const u_char *bp, int is_mdns)
+ns_qprint(netdissect_options *ndo,
+          register const u_char *cp, register const u_char *bp, int is_mdns)
 {
        register const u_char *np = cp;
 {
        register const u_char *np = cp;
-       register u_int i;
+       register u_int i, class;
 
 
-       cp = ns_nskip(cp);
+       cp = ns_nskip(ndo, cp);
 
 
-       if (cp == NULL || !TTEST2(*cp, 4))
+       if (cp == NULL || !ND_TTEST_4(cp))
                return(NULL);
 
                return(NULL);
 
-       /* print the qtype and qclass (if it's not IN) */
-       i = EXTRACT_16BITS(cp);
+       /* print the qtype */
+       i = EXTRACT_BE_U_2(cp);
        cp += 2;
        cp += 2;
-       printf(" %s", tok2str(ns_type2str, "Type%d", i));
-       i = EXTRACT_16BITS(cp);
+       ND_PRINT((ndo, " %s", tok2str(ns_type2str, "Type%d", i)));
+       /* print the qclass (if it's not IN) */
+       i = EXTRACT_BE_U_2(cp);
        cp += 2;
        cp += 2;
-       if (is_mdns && i == (C_IN|C_CACHE_FLUSH))
-               printf(" (Cache flush)");
-       else if (i != C_IN)
-               printf(" %s", tok2str(ns_class2str, "(Class %d)", i));
+       if (is_mdns)
+               class = (i & ~C_QU);
+       else
+               class = i;
+       if (class != C_IN)
+               ND_PRINT((ndo, " %s", tok2str(ns_class2str, "(Class %d)", class)));
+       if (is_mdns) {
+               ND_PRINT((ndo, i & C_QU ? " (QU)" : " (QM)"));
+       }
 
 
-       fputs("? ", stdout);
-       cp = ns_nprint(np, bp);
+       ND_PRINT((ndo, "? "));
+       cp = ns_nprint(ndo, np, bp);
        return(cp ? cp + 4 : NULL);
 }
 
 /* print a reply */
 static const u_char *
        return(cp ? cp + 4 : NULL);
 }
 
 /* print a reply */
 static const u_char *
-ns_rprint(register const u_char *cp, register const u_char *bp, int is_mdns)
+ns_rprint(netdissect_options *ndo,
+          register const u_char *cp, register const u_char *bp, int is_mdns)
 {
 {
-       register u_int class;
+       register u_int i, class, opt_flags = 0;
        register u_short typ, len;
        register const u_char *rp;
 
        register u_short typ, len;
        register const u_char *rp;
 
-       if (vflag) {
-               putchar(' ');
-               if ((cp = ns_nprint(cp, bp)) == NULL)
+       if (ndo->ndo_vflag) {
+               ND_PRINT((ndo, " "));
+               if ((cp = ns_nprint(ndo, cp, bp)) == NULL)
                        return NULL;
        } else
                        return NULL;
        } else
-               cp = ns_nskip(cp);
+               cp = ns_nskip(ndo, cp);
 
 
-       if (cp == NULL || !TTEST2(*cp, 10))
-               return (snapend);
+       if (cp == NULL || !ND_TTEST2(*cp, 10))
+               return (ndo->ndo_snapend);
 
 
-       /* print the type/qtype and class (if it's not IN) */
-       typ = EXTRACT_16BITS(cp);
+       /* print the type/qtype */
+       typ = EXTRACT_BE_U_2(cp);
        cp += 2;
        cp += 2;
-       class = EXTRACT_16BITS(cp);
+       /* print the class (if it's not IN and the type isn't OPT) */
+       i = EXTRACT_BE_U_2(cp);
        cp += 2;
        cp += 2;
-       if (is_mdns && class == (C_IN|C_CACHE_FLUSH))
-               printf(" (Cache flush)");
-       else if (class != C_IN && typ != T_OPT)
-               printf(" %s", tok2str(ns_class2str, "(Class %d)", class));
+       if (is_mdns)
+               class = (i & ~C_CACHE_FLUSH);
+       else
+               class = i;
+       if (class != C_IN && typ != T_OPT)
+               ND_PRINT((ndo, " %s", tok2str(ns_class2str, "(Class %d)", class)));
+       if (is_mdns) {
+               if (i & C_CACHE_FLUSH)
+                       ND_PRINT((ndo, " (Cache flush)"));
+       }
 
 
-       /* ignore ttl */
-       cp += 4;
+       if (typ == T_OPT) {
+               /* get opt flags */
+               cp += 2;
+               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, " ["));
+               unsigned_relts_print(ndo, EXTRACT_BE_U_4(cp));
+               ND_PRINT((ndo, "]"));
+               cp += 4;
+       } else {
+               /* ignore ttl */
+               cp += 4;
+       }
 
 
-       len = EXTRACT_16BITS(cp);
+       len = EXTRACT_BE_U_2(cp);
        cp += 2;
 
        rp = cp + len;
 
        cp += 2;
 
        rp = cp + len;
 
-       printf(" %s", tok2str(ns_type2str, "Type%d", typ));
-       if (rp > snapend)
+       ND_PRINT((ndo, " %s", tok2str(ns_type2str, "Type%d", typ)));
+       if (rp > ndo->ndo_snapend)
                return(NULL);
 
        switch (typ) {
        case T_A:
                return(NULL);
 
        switch (typ) {
        case T_A:
-               if (!TTEST2(*cp, sizeof(struct in_addr)))
+               if (!ND_TTEST2(*cp, sizeof(struct in_addr)))
                        return(NULL);
                        return(NULL);
-               printf(" %s", ipaddr_string(cp));
+               ND_PRINT((ndo, " %s", intoa(htonl(EXTRACT_BE_U_4(cp)))));
                break;
 
        case T_NS:
                break;
 
        case T_NS:
@@ -384,137 +438,145 @@ ns_rprint(register const u_char *cp, register const u_char *bp, int is_mdns)
 #ifdef T_DNAME
        case T_DNAME:
 #endif
 #ifdef T_DNAME
        case T_DNAME:
 #endif
-               putchar(' ');
-               if (ns_nprint(cp, bp) == NULL)
+               ND_PRINT((ndo, " "));
+               if (ns_nprint(ndo, cp, bp) == NULL)
                        return(NULL);
                break;
 
        case T_SOA:
                        return(NULL);
                break;
 
        case T_SOA:
-               if (!vflag)
+               if (!ndo->ndo_vflag)
                        break;
                        break;
-               putchar(' ');
-               if ((cp = ns_nprint(cp, bp)) == NULL)
+               ND_PRINT((ndo, " "));
+               if ((cp = ns_nprint(ndo, cp, bp)) == NULL)
                        return(NULL);
                        return(NULL);
-               putchar(' ');
-               if ((cp = ns_nprint(cp, bp)) == NULL)
+               ND_PRINT((ndo, " "));
+               if ((cp = ns_nprint(ndo, cp, bp)) == NULL)
                        return(NULL);
                        return(NULL);
-               if (!TTEST2(*cp, 5 * 4))
+               if (!ND_TTEST2(*cp, 5 * 4))
                        return(NULL);
                        return(NULL);
-               printf(" %u", EXTRACT_32BITS(cp));
+               ND_PRINT((ndo, " %u", EXTRACT_BE_U_4(cp)));
                cp += 4;
                cp += 4;
-               printf(" %u", EXTRACT_32BITS(cp));
+               ND_PRINT((ndo, " %u", EXTRACT_BE_U_4(cp)));
                cp += 4;
                cp += 4;
-               printf(" %u", EXTRACT_32BITS(cp));
+               ND_PRINT((ndo, " %u", EXTRACT_BE_U_4(cp)));
                cp += 4;
                cp += 4;
-               printf(" %u", EXTRACT_32BITS(cp));
+               ND_PRINT((ndo, " %u", EXTRACT_BE_U_4(cp)));
                cp += 4;
                cp += 4;
-               printf(" %u", EXTRACT_32BITS(cp));
+               ND_PRINT((ndo, " %u", EXTRACT_BE_U_4(cp)));
                cp += 4;
                break;
        case T_MX:
                cp += 4;
                break;
        case T_MX:
-               putchar(' ');
-               if (!TTEST2(*cp, 2))
+               ND_PRINT((ndo, " "));
+               if (!ND_TTEST_2(cp))
                        return(NULL);
                        return(NULL);
-               if (ns_nprint(cp + 2, bp) == NULL)
+               if (ns_nprint(ndo, cp + 2, bp) == NULL)
                        return(NULL);
                        return(NULL);
-               printf(" %d", EXTRACT_16BITS(cp));
+               ND_PRINT((ndo, " %d", EXTRACT_BE_U_2(cp)));
                break;
 
        case T_TXT:
                while (cp < rp) {
                break;
 
        case T_TXT:
                while (cp < rp) {
-                       printf(" \"");
-                       cp = ns_cprint(cp);
+                       ND_PRINT((ndo, " \""));
+                       cp = ns_cprint(ndo, cp);
                        if (cp == NULL)
                                return(NULL);
                        if (cp == NULL)
                                return(NULL);
-                       putchar('"');
+                       ND_PRINT((ndo, "\""));
                }
                break;
 
        case T_SRV:
                }
                break;
 
        case T_SRV:
-               putchar(' ');
-               if (!TTEST2(*cp, 6))
+               ND_PRINT((ndo, " "));
+               if (!ND_TTEST_6(cp))
                        return(NULL);
                        return(NULL);
-               if (ns_nprint(cp + 6, bp) == NULL)
+               if (ns_nprint(ndo, cp + 6, bp) == NULL)
                        return(NULL);
                        return(NULL);
-               printf(":%d %d %d", EXTRACT_16BITS(cp + 4),
-                       EXTRACT_16BITS(cp), EXTRACT_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;
 
                break;
 
-#ifdef INET6
        case T_AAAA:
        case T_AAAA:
-               if (!TTEST2(*cp, sizeof(struct in6_addr)))
+           {
+               char ntop_buf[INET6_ADDRSTRLEN];
+
+               if (!ND_TTEST2(*cp, sizeof(struct in6_addr)))
                        return(NULL);
                        return(NULL);
-               printf(" %s", ip6addr_string(cp));
+               ND_PRINT((ndo, " %s",
+                   addrtostr6(cp, ntop_buf, sizeof(ntop_buf))));
+
                break;
                break;
+           }
 
        case T_A6:
            {
                struct in6_addr a;
                int pbit, pbyte;
 
        case T_A6:
            {
                struct in6_addr a;
                int pbit, pbyte;
+               char ntop_buf[INET6_ADDRSTRLEN];
 
 
-               if (!TTEST2(*cp, 1))
+               if (!ND_TTEST_1(cp))
                        return(NULL);
                        return(NULL);
-               pbit = *cp;
+               pbit = EXTRACT_U_1(cp);
                pbyte = (pbit & ~7) / 8;
                if (pbit > 128) {
                pbyte = (pbit & ~7) / 8;
                if (pbit > 128) {
-                       printf(" %u(bad plen)", pbit);
+                       ND_PRINT((ndo, " %u(bad plen)", pbit));
                        break;
                } else if (pbit < 128) {
                        break;
                } else if (pbit < 128) {
-                       if (!TTEST2(*(cp + 1), sizeof(a) - pbyte))
+                       if (!ND_TTEST2(*(cp + 1), sizeof(a) - pbyte))
                                return(NULL);
                        memset(&a, 0, sizeof(a));
                        memcpy(&a.s6_addr[pbyte], cp + 1, sizeof(a) - pbyte);
                                return(NULL);
                        memset(&a, 0, sizeof(a));
                        memcpy(&a.s6_addr[pbyte], cp + 1, sizeof(a) - pbyte);
-                       printf(" %u %s", pbit, ip6addr_string(&a));
+                       ND_PRINT((ndo, " %u %s", pbit,
+                           addrtostr6(&a, ntop_buf, sizeof(ntop_buf))));
                }
                if (pbit > 0) {
                }
                if (pbit > 0) {
-                       putchar(' ');
-                       if (ns_nprint(cp + 1 + sizeof(a) - pbyte, bp) == NULL)
+                       ND_PRINT((ndo, " "));
+                       if (ns_nprint(ndo, cp + 1 + sizeof(a) - pbyte, bp) == NULL)
                                return(NULL);
                }
                break;
            }
                                return(NULL);
                }
                break;
            }
-#endif /*INET6*/
 
        case T_OPT:
 
        case T_OPT:
-               printf(" UDPsize=%u", class);
+               ND_PRINT((ndo, " UDPsize=%u", class));
+               if (opt_flags & 0x8000)
+                       ND_PRINT((ndo, " DO"));
                break;
 
        case T_UNSPECA:         /* One long string */
                break;
 
        case T_UNSPECA:         /* One long string */
-               if (!TTEST2(*cp, len))
+               if (!ND_TTEST2(*cp, len))
                        return(NULL);
                        return(NULL);
-               if (fn_printn(cp, len, snapend))
+               if (fn_printn(ndo, cp, len, ndo->ndo_snapend))
                        return(NULL);
                break;
 
        case T_TSIG:
            {
                        return(NULL);
                break;
 
        case T_TSIG:
            {
-               if (cp + len > snapend)
+               if (cp + len > ndo->ndo_snapend)
                        return(NULL);
                        return(NULL);
-               if (!vflag)
+               if (!ndo->ndo_vflag)
                        break;
                        break;
-               putchar(' ');
-               if ((cp = ns_nprint(cp, bp)) == NULL)
+               ND_PRINT((ndo, " "));
+               if ((cp = ns_nprint(ndo, cp, bp)) == NULL)
                        return(NULL);
                cp += 6;
                        return(NULL);
                cp += 6;
-               if (!TTEST2(*cp, 2))
+               if (!ND_TTEST_2(cp))
                        return(NULL);
                        return(NULL);
-               printf(" fudge=%u", EXTRACT_16BITS(cp));
+               ND_PRINT((ndo, " fudge=%u", EXTRACT_BE_U_2(cp)));
                cp += 2;
                cp += 2;
-               if (!TTEST2(*cp, 2))
+               if (!ND_TTEST_2(cp))
                        return(NULL);
                        return(NULL);
-               printf(" maclen=%u", EXTRACT_16BITS(cp));
-               cp += 2 + EXTRACT_16BITS(cp);
-               if (!TTEST2(*cp, 2))
+               ND_PRINT((ndo, " maclen=%u", EXTRACT_BE_U_2(cp)));
+               cp += 2 + EXTRACT_BE_U_2(cp);
+               if (!ND_TTEST_2(cp))
                        return(NULL);
                        return(NULL);
-               printf(" origid=%u", EXTRACT_16BITS(cp));
+               ND_PRINT((ndo, " origid=%u", EXTRACT_BE_U_2(cp)));
                cp += 2;
                cp += 2;
-               if (!TTEST2(*cp, 2))
+               if (!ND_TTEST_2(cp))
                        return(NULL);
                        return(NULL);
-               printf(" error=%u", EXTRACT_16BITS(cp));
+               ND_PRINT((ndo, " error=%u", EXTRACT_BE_U_2(cp)));
                cp += 2;
                cp += 2;
-               if (!TTEST2(*cp, 2))
+               if (!ND_TTEST_2(cp))
                        return(NULL);
                        return(NULL);
-               printf(" otherlen=%u", EXTRACT_16BITS(cp));
+               ND_PRINT((ndo, " otherlen=%u", EXTRACT_BE_U_2(cp)));
                cp += 2;
            }
        }
                cp += 2;
            }
        }
@@ -522,82 +584,83 @@ ns_rprint(register const u_char *cp, register const u_char *bp, int is_mdns)
 }
 
 void
 }
 
 void
-ns_print(register const u_char *bp, u_int length, int is_mdns)
+domain_print(netdissect_options *ndo,
+         register const u_char *bp, u_int length, int is_mdns)
 {
        register const HEADER *np;
        register int qdcount, ancount, nscount, arcount;
        register const u_char *cp;
 {
        register const HEADER *np;
        register int qdcount, ancount, nscount, arcount;
        register const u_char *cp;
-       u_int16_t b2;
+       uint16_t b2;
 
        np = (const HEADER *)bp;
 
        np = (const HEADER *)bp;
-       TCHECK(*np);
+       ND_TCHECK(*np);
        /* get the byte-order right */
        /* get the byte-order right */
-       qdcount = EXTRACT_16BITS(&np->qdcount);
-       ancount = EXTRACT_16BITS(&np->ancount);
-       nscount = EXTRACT_16BITS(&np->nscount);
-       arcount = EXTRACT_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 */
 
        if (DNS_QR(np)) {
                /* this is a response */
-               printf(" %d%s%s%s%s%s%s",
-                       EXTRACT_16BITS(&np->id),
+               ND_PRINT((ndo, "%d%s%s%s%s%s%s",
+                       EXTRACT_BE_U_2(&np->id),
                        ns_ops[DNS_OPCODE(np)],
                        ns_resp[DNS_RCODE(np)],
                        DNS_AA(np)? "*" : "",
                        DNS_RA(np)? "" : "-",
                        DNS_TC(np)? "|" : "",
                        ns_ops[DNS_OPCODE(np)],
                        ns_resp[DNS_RCODE(np)],
                        DNS_AA(np)? "*" : "",
                        DNS_RA(np)? "" : "-",
                        DNS_TC(np)? "|" : "",
-                       DNS_AD(np)? "$" : "");
+                       DNS_AD(np)? "$" : ""));
 
                if (qdcount != 1)
 
                if (qdcount != 1)
-                       printf(" [%dq]", qdcount);
+                       ND_PRINT((ndo, " [%dq]", qdcount));
                /* 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_16BITS(&np->qdcount) - 1)
-                               putchar(',');
-                       if (vflag > 1) {
-                               fputs(" q:", stdout);
-                               if ((cp = ns_qprint(cp, bp, is_mdns)) == NULL)
+                       if (qdcount < EXTRACT_BE_U_2(&np->qdcount) - 1)
+                               ND_PRINT((ndo, ","));
+                       if (ndo->ndo_vflag > 1) {
+                               ND_PRINT((ndo, " q:"));
+                               if ((cp = ns_qprint(ndo, cp, bp, is_mdns)) == NULL)
                                        goto trunc;
                        } else {
                                        goto trunc;
                        } else {
-                               if ((cp = ns_nskip(cp)) == NULL)
+                               if ((cp = ns_nskip(ndo, cp)) == NULL)
                                        goto trunc;
                                cp += 4;        /* skip QTYPE and QCLASS */
                        }
                }
                                        goto trunc;
                                cp += 4;        /* skip QTYPE and QCLASS */
                        }
                }
-               printf(" %d/%d/%d", ancount, nscount, arcount);
+               ND_PRINT((ndo, " %d/%d/%d", ancount, nscount, arcount));
                if (ancount--) {
                if (ancount--) {
-                       if ((cp = ns_rprint(cp, bp, is_mdns)) == NULL)
+                       if ((cp = ns_rprint(ndo, cp, bp, is_mdns)) == NULL)
                                goto trunc;
                                goto trunc;
-                       while (cp < snapend && ancount--) {
-                               putchar(',');
-                               if ((cp = ns_rprint(cp, bp, is_mdns)) == NULL)
+                       while (cp < ndo->ndo_snapend && ancount--) {
+                               ND_PRINT((ndo, ","));
+                               if ((cp = ns_rprint(ndo, cp, bp, is_mdns)) == NULL)
                                        goto trunc;
                        }
                }
                if (ancount > 0)
                        goto trunc;
                /* Print NS and AR sections on -vv */
                                        goto trunc;
                        }
                }
                if (ancount > 0)
                        goto trunc;
                /* Print NS and AR sections on -vv */
-               if (vflag > 1) {
-                       if (cp < snapend && nscount--) {
-                               fputs(" ns:", stdout);
-                               if ((cp = ns_rprint(cp, bp, is_mdns)) == NULL)
+               if (ndo->ndo_vflag > 1) {
+                       if (cp < ndo->ndo_snapend && nscount--) {
+                               ND_PRINT((ndo, " ns:"));
+                               if ((cp = ns_rprint(ndo, cp, bp, is_mdns)) == NULL)
                                        goto trunc;
                                        goto trunc;
-                               while (cp < snapend && nscount--) {
-                                       putchar(',');
-                                       if ((cp = ns_rprint(cp, bp, is_mdns)) == NULL)
+                               while (cp < ndo->ndo_snapend && nscount--) {
+                                       ND_PRINT((ndo, ","));
+                                       if ((cp = ns_rprint(ndo, cp, bp, is_mdns)) == NULL)
                                                goto trunc;
                                }
                        }
                        if (nscount > 0)
                                goto trunc;
                                                goto trunc;
                                }
                        }
                        if (nscount > 0)
                                goto trunc;
-                       if (cp < snapend && arcount--) {
-                               fputs(" ar:", stdout);
-                               if ((cp = ns_rprint(cp, bp, is_mdns)) == NULL)
+                       if (cp < ndo->ndo_snapend && arcount--) {
+                               ND_PRINT((ndo, " ar:"));
+                               if ((cp = ns_rprint(ndo, cp, bp, is_mdns)) == NULL)
                                        goto trunc;
                                        goto trunc;
-                               while (cp < snapend && arcount--) {
-                                       putchar(',');
-                                       if ((cp = ns_rprint(cp, bp, is_mdns)) == NULL)
+                               while (cp < ndo->ndo_snapend && arcount--) {
+                                       ND_PRINT((ndo, ","));
+                                       if ((cp = ns_rprint(ndo, cp, bp, is_mdns)) == NULL)
                                                goto trunc;
                                }
                        }
                                                goto trunc;
                                }
                        }
@@ -607,39 +670,39 @@ ns_print(register const u_char *bp, u_int length, int is_mdns)
        }
        else {
                /* this is a request */
        }
        else {
                /* this is a request */
-               printf(" %d%s%s%s", EXTRACT_16BITS(&np->id), ns_ops[DNS_OPCODE(np)],
-                   DNS_RD(np) ? "+" : "",
-                   DNS_CD(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? */
 
                /* any weirdness? */
-               b2 = EXTRACT_16BITS(((u_short *)np)+1);
+               b2 = EXTRACT_BE_U_2(((const u_short *)np) + 1);
                if (b2 & 0x6cf)
                if (b2 & 0x6cf)
-                       printf(" [b2&3=0x%x]", b2);
+                       ND_PRINT((ndo, " [b2&3=0x%x]", b2));
 
                if (DNS_OPCODE(np) == IQUERY) {
                        if (qdcount)
 
                if (DNS_OPCODE(np) == IQUERY) {
                        if (qdcount)
-                               printf(" [%dq]", qdcount);
+                               ND_PRINT((ndo, " [%dq]", qdcount));
                        if (ancount != 1)
                        if (ancount != 1)
-                               printf(" [%da]", ancount);
+                               ND_PRINT((ndo, " [%da]", ancount));
                }
                else {
                        if (ancount)
                }
                else {
                        if (ancount)
-                               printf(" [%da]", ancount);
+                               ND_PRINT((ndo, " [%da]", ancount));
                        if (qdcount != 1)
                        if (qdcount != 1)
-                               printf(" [%dq]", qdcount);
+                               ND_PRINT((ndo, " [%dq]", qdcount));
                }
                if (nscount)
                }
                if (nscount)
-                       printf(" [%dn]", nscount);
+                       ND_PRINT((ndo, " [%dn]", nscount));
                if (arcount)
                if (arcount)
-                       printf(" [%dau]", arcount);
+                       ND_PRINT((ndo, " [%dau]", arcount));
 
                cp = (const u_char *)(np + 1);
                if (qdcount--) {
 
                cp = (const u_char *)(np + 1);
                if (qdcount--) {
-                       cp = ns_qprint(cp, (const u_char *)np, is_mdns);
+                       cp = ns_qprint(ndo, cp, (const u_char *)np, is_mdns);
                        if (!cp)
                                goto trunc;
                        if (!cp)
                                goto trunc;
-                       while (cp < snapend && qdcount--) {
-                               cp = ns_qprint((const u_char *)cp,
+                       while (cp < ndo->ndo_snapend && qdcount--) {
+                               cp = ns_qprint(ndo, (const u_char *)cp,
                                               (const u_char *)np,
                                               is_mdns);
                                if (!cp)
                                               (const u_char *)np,
                                               is_mdns);
                                if (!cp)
@@ -650,37 +713,37 @@ ns_print(register const u_char *bp, u_int length, int is_mdns)
                        goto trunc;
 
                /* Print remaining sections on -vv */
                        goto trunc;
 
                /* Print remaining sections on -vv */
-               if (vflag > 1) {
+               if (ndo->ndo_vflag > 1) {
                        if (ancount--) {
                        if (ancount--) {
-                               if ((cp = ns_rprint(cp, bp, is_mdns)) == NULL)
+                               if ((cp = ns_rprint(ndo, cp, bp, is_mdns)) == NULL)
                                        goto trunc;
                                        goto trunc;
-                               while (cp < snapend && ancount--) {
-                                       putchar(',');
-                                       if ((cp = ns_rprint(cp, bp, is_mdns)) == NULL)
+                               while (cp < ndo->ndo_snapend && ancount--) {
+                                       ND_PRINT((ndo, ","));
+                                       if ((cp = ns_rprint(ndo, cp, bp, is_mdns)) == NULL)
                                                goto trunc;
                                }
                        }
                        if (ancount > 0)
                                goto trunc;
                                                goto trunc;
                                }
                        }
                        if (ancount > 0)
                                goto trunc;
-                       if (cp < snapend && nscount--) {
-                               fputs(" ns:", stdout);
-                               if ((cp = ns_rprint(cp, bp, is_mdns)) == NULL)
+                       if (cp < ndo->ndo_snapend && nscount--) {
+                               ND_PRINT((ndo, " ns:"));
+                               if ((cp = ns_rprint(ndo, cp, bp, is_mdns)) == NULL)
                                        goto trunc;
                                        goto trunc;
-                               while (nscount-- && cp < snapend) {
-                                       putchar(',');
-                                       if ((cp = ns_rprint(cp, bp, is_mdns)) == NULL)
+                               while (nscount-- && cp < ndo->ndo_snapend) {
+                                       ND_PRINT((ndo, ","));
+                                       if ((cp = ns_rprint(ndo, cp, bp, is_mdns)) == NULL)
                                                goto trunc;
                                }
                        }
                        if (nscount > 0)
                                goto trunc;
                                                goto trunc;
                                }
                        }
                        if (nscount > 0)
                                goto trunc;
-                       if (cp < snapend && arcount--) {
-                               fputs(" ar:", stdout);
-                               if ((cp = ns_rprint(cp, bp, is_mdns)) == NULL)
+                       if (cp < ndo->ndo_snapend && arcount--) {
+                               ND_PRINT((ndo, " ar:"));
+                               if ((cp = ns_rprint(ndo, cp, bp, is_mdns)) == NULL)
                                        goto trunc;
                                        goto trunc;
-                               while (cp < snapend && arcount--) {
-                                       putchar(',');
-                                       if ((cp = ns_rprint(cp, bp, is_mdns)) == NULL)
+                               while (cp < ndo->ndo_snapend && arcount--) {
+                                       ND_PRINT((ndo, ","));
+                                       if ((cp = ns_rprint(ndo, cp, bp, is_mdns)) == NULL)
                                                goto trunc;
                                }
                        }
                                                goto trunc;
                                }
                        }
@@ -688,10 +751,9 @@ ns_print(register const u_char *bp, u_int length, int is_mdns)
                                goto trunc;
                }
        }
                                goto trunc;
                }
        }
-       printf(" (%d)", length);
+       ND_PRINT((ndo, " (%d)", length));
        return;
 
   trunc:
        return;
 
   trunc:
-       printf("[|domain]");
-       return;
+       ND_PRINT((ndo, "[|domain]"));
 }
 }
[mirror] the TCPdump network dissector