NDOize more small decoders

[tcpdump] / print-domain.c

diff --git a/print-domain.c b/print-domain.c
index a10aad815238ed56ddc840f26cbfcceec78a67e6..9c229e033f4f0041f0602723935bfe39cd7d06e1 100644 (file)
--- a/print-domain.c
+++ b/print-domain.c
@@ -19,11 +19,6 @@
  * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  */
 
-#ifndef lint
-static const char rcsid[] _U_ =
-    "@(#) $Header: /tcpdump/master/tcpdump/print-domain.c,v 1.95 2006-11-12 23:12:03 guy Exp $ (LBL)";
-#endif
-
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
@@ -144,7 +139,7 @@ labellen(const u_char *cp)
                return(i);
 }
 
-static const u_char *
+const u_char *
 ns_nprint(register const u_char *cp, register const u_char *bp)
 {
        register u_int i, l;
@@ -242,7 +237,7 @@ ns_cprint(register const u_char *cp)
 }
 
 /* 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 */
@@ -307,7 +302,7 @@ struct tok ns_type2str[] = {
        { 0,            NULL }
 };
 
-struct tok ns_class2str[] = {
+const struct tok ns_class2str[] = {
        { C_IN,         "IN" },         /* Not used */
        { C_CHAOS,      "CHAOS" },
        { C_HS,         "HS" },
@@ -320,7 +315,7 @@ static const u_char *
 ns_qprint(register const u_char *cp, register const u_char *bp, int is_mdns)
 {
        register const u_char *np = cp;
-       register u_int i, class, qu;
+       register u_int i, class;
 
        cp = ns_nskip(cp);
 
@@ -334,19 +329,18 @@ ns_qprint(register const u_char *cp, register const u_char *bp, int is_mdns)
        /* print the qclass (if it's not IN) */
        i = EXTRACT_16BITS(cp);
        cp += 2;
-       if (is_mdns) {
+       if (is_mdns)
                class = (i & ~C_QU);
-               qu = (i & C_QU);
-       } else {
+       else
                class = i;
-               qu = 0;
-       }
        if (class != C_IN)
                printf(" %s", tok2str(ns_class2str, "(Class %d)", class));
-       if (qu)
-               printf(" (QU)");
-       else
-               printf(" (QM)");
+       if (is_mdns) {
+               if (i & C_QU)
+                       printf(" (QU)");
+               else
+                       printf(" (QM)");
+       }
 
        fputs("? ", stdout);
        cp = ns_nprint(np, bp);
@@ -357,7 +351,7 @@ ns_qprint(register const u_char *cp, register const u_char *bp, int is_mdns)
 static const u_char *
 ns_rprint(register const u_char *cp, register const u_char *bp, int is_mdns)
 {
-       register u_int i, class, cache_flush, opt_flags = 0;
+       register u_int i, class, opt_flags = 0;
        register u_short typ, len;
        register const u_char *rp;
 
@@ -377,25 +371,33 @@ ns_rprint(register const u_char *cp, register const u_char *bp, int is_mdns)
        /* print the class (if it's not IN and the type isn't OPT) */
        i = EXTRACT_16BITS(cp);
        cp += 2;
-       if (is_mdns) {
+       if (is_mdns)
                class = (i & ~C_CACHE_FLUSH);
-               cache_flush = i & C_CACHE_FLUSH;
-       } else {
+       else
                class = i;
-               cache_flush = 0;
-       }
        if (class != C_IN && typ != T_OPT)
                printf(" %s", tok2str(ns_class2str, "(Class %d)", class));
-       if (cache_flush)
-               printf(" (Cache flush)");
+       if (is_mdns) {
+               if (i & C_CACHE_FLUSH)
+                       printf(" (Cache flush)");
+       }
 
-       /* ignore ttl */
-       cp += 2;
-       /* if T_OPT, save opt_flags */
-       if (typ == T_OPT)
+       if (typ == T_OPT) {
+               /* get opt flags */
+               cp += 2;
                opt_flags = EXTRACT_16BITS(cp);
-       /* ignore rest of ttl */
-       cp += 2;
+               /* ignore rest of ttl field */
+               cp += 2;
+       } else if (vflag > 2) {
+               /* print ttl */
+               printf(" [");
+               relts_print(EXTRACT_32BITS(cp));
+               printf("]");
+               cp += 4;
+       } else {
+               /* ignore ttl */
+               cp += 4;
+       }
 
        len = EXTRACT_16BITS(cp);
        cp += 2;
@@ -410,7 +412,7 @@ ns_rprint(register const u_char *cp, register const u_char *bp, int is_mdns)
        case T_A:
                if (!TTEST2(*cp, sizeof(struct in_addr)))
                        return(NULL);
-               printf(" %s", ipaddr_string(cp));
+               printf(" %s", intoa(htonl(EXTRACT_32BITS(cp))));
                break;
 
        case T_NS:
@@ -477,15 +479,24 @@ ns_rprint(register const u_char *cp, register const u_char *bp, int is_mdns)
 
 #ifdef INET6
        case T_AAAA:
+           {
+               struct in6_addr addr;
+               char ntop_buf[INET6_ADDRSTRLEN];
+
                if (!TTEST2(*cp, sizeof(struct in6_addr)))
                        return(NULL);
-               printf(" %s", ip6addr_string(cp));
+               memcpy(&addr, cp, sizeof(struct in6_addr));
+               printf(" %s",
+                   inet_ntop(AF_INET6, &addr, ntop_buf, sizeof(ntop_buf)));
+
                break;
+           }
 
        case T_A6:
            {
                struct in6_addr a;
                int pbit, pbyte;
+               char ntop_buf[INET6_ADDRSTRLEN];
 
                if (!TTEST2(*cp, 1))
                        return(NULL);
@@ -499,7 +510,8 @@ ns_rprint(register const u_char *cp, register const u_char *bp, int is_mdns)
                                return(NULL);
                        memset(&a, 0, sizeof(a));
                        memcpy(&a.s6_addr[pbyte], cp + 1, sizeof(a) - pbyte);
-                       printf(" %u %s", pbit, ip6addr_string(&a));
+                       printf(" %u %s", pbit,
+                           inet_ntop(AF_INET6, &a, ntop_buf, sizeof(ntop_buf)));
                }
                if (pbit > 0) {
                        putchar(' ');
@@ -576,7 +588,7 @@ ns_print(register const u_char *bp, u_int length, int is_mdns)
 
        if (DNS_QR(np)) {
                /* this is a response */
-               printf(" %d%s%s%s%s%s%s",
+               printf("%d%s%s%s%s%s%s",
                        EXTRACT_16BITS(&np->id),
                        ns_ops[DNS_OPCODE(np)],
                        ns_resp[DNS_RCODE(np)],
@@ -644,7 +656,7 @@ ns_print(register const u_char *bp, u_int length, int is_mdns)
        }
        else {
                /* this is a request */
-               printf(" %d%s%s%s", EXTRACT_16BITS(&np->id), ns_ops[DNS_OPCODE(np)],
+               printf("%d%s%s%s", EXTRACT_16BITS(&np->id), ns_ops[DNS_OPCODE(np)],
                    DNS_RD(np) ? "+" : "",
                    DNS_CD(np) ? "%" : "");