X-Git-Url: https://git.tcpdump.org/tcpdump/blobdiff_plain/3cd171317f54bc968808d49e3ca87b6c49ccdcdd..refs/pull/440/head:/print-domain.c diff --git a/print-domain.c b/print-domain.c index 172d5267..8805007a 100644 --- a/print-domain.c +++ b/print-domain.c @@ -19,149 +19,62 @@ * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. */ -#ifndef lint -static const char rcsid[] = - "@(#) $Header: /tcpdump/master/tcpdump/print-domain.c,v 1.45 2000-07-01 03:39:02 assar Exp $ (LBL)"; -#endif - +#define NETDISSECT_REWORKED #ifdef HAVE_CONFIG_H #include "config.h" #endif -#include -#include -#include - -struct mbuf; -struct rtentry; -#include - -#include -#include -#include -#include -#include -#include -#include -#include - -#ifdef NOERROR -#undef NOERROR /* Solaris sucks */ -#endif -#ifdef NOERROR -#undef T_UNSPEC /* SINIX does too */ -#endif -#include +#include + +#include "nameser.h" -#include #include #include "interface.h" #include "addrtoname.h" #include "extract.h" /* must come after interface.h */ -/* Compatibility */ -#ifndef T_TXT -#define T_TXT 16 /* text strings */ -#endif -#ifndef T_RP -#define T_RP 17 /* responsible person */ -#endif -#ifndef T_AFSDB -#define T_AFSDB 18 /* AFS cell database */ -#endif -#ifndef T_X25 -#define T_X25 19 /* X_25 calling address */ -#endif -#ifndef T_ISDN -#define T_ISDN 20 /* ISDN calling address */ -#endif -#ifndef T_RT -#define T_RT 21 /* router */ -#endif -#ifndef T_NSAP -#define T_NSAP 22 /* NSAP address */ -#endif -#ifndef T_NSAP_PTR -#define T_NSAP_PTR 23 /* reverse NSAP lookup (deprecated) */ -#endif -#ifndef T_SIG -#define T_SIG 24 /* security signature */ -#endif -#ifndef T_KEY -#define T_KEY 25 /* security key */ -#endif -#ifndef T_PX -#define T_PX 26 /* X.400 mail mapping */ -#endif -#ifndef T_GPOS -#define T_GPOS 27 /* geographical position (withdrawn) */ -#endif -#ifndef T_AAAA -#define T_AAAA 28 /* IP6 Address */ -#endif -#ifndef T_LOC -#define T_LOC 29 /* Location Information */ -#endif -#ifndef T_NXT -#define T_NXT 30 /* Next Valid Name in Zone */ -#endif -#ifndef T_EID -#define T_EID 31 /* Endpoint identifier */ -#endif -#ifndef T_NIMLOC -#define T_NIMLOC 32 /* Nimrod locator */ -#endif -#ifndef T_SRV -#define T_SRV 33 /* Server selection */ -#endif -#ifndef T_ATMA -#define T_ATMA 34 /* ATM Address */ -#endif -#ifndef T_NAPTR -#define T_NAPTR 35 /* Naming Authority PoinTeR */ -#endif -#ifndef T_A6 -#define T_A6 38 /* IP6 address (ipngwg-dns-lookups) */ -#endif - -#ifndef T_UNSPEC -#define T_UNSPEC 103 /* Unspecified format (binary data) */ -#endif -#ifndef T_UNSPECA -#define T_UNSPECA 104 /* "unspecified ascii". Ugly MIT hack */ -#endif - -#ifndef C_CHAOS -#define C_CHAOS 3 /* for chaos net (MIT) */ -#endif -#ifndef C_HS -#define C_HS 4 /* for Hesiod name server (MIT) (XXX) */ -#endif - -static char *ns_ops[] = { - "", " inv_q", " stat", " op3", " notify", " op5", " op6", " op7", - " op8", " updataA", " updateD", " updateDA", +static const char *ns_ops[] = { + "", " inv_q", " stat", " op3", " notify", " update", " op6", " op7", + " op8", " updateA", " updateD", " updateDA", " updateM", " updateMA", " zoneInit", " zoneRef", }; -static char *ns_resp[] = { +static const char *ns_resp[] = { "", " FormErr", " ServFail", " NXDomain", - " NotImp", " Refused", " Resp6", " Resp7", - " Resp8", " Resp9", " Resp10", " Resp11", + " NotImp", " Refused", " YXDomain", " YXRRSet", + " NXRRSet", " NotAuth", " NotZone", " Resp11", " Resp12", " Resp13", " Resp14", " NoChange", }; /* skip over a domain name */ static const u_char * -ns_nskip(register const u_char *cp, register const u_char *bp) +ns_nskip(netdissect_options *ndo, + register const u_char *cp) { register u_char i; - if (((i = *cp++) & INDIR_MASK) == INDIR_MASK) - return (cp + 1); - while (i && cp < snapend) { - cp += i; + if (!ND_TTEST2(*cp, 1)) + return (NULL); + i = *cp++; + while (i) { + if ((i & INDIR_MASK) == INDIR_MASK) + return (cp + 1); + if ((i & INDIR_MASK) == EDNS0_MASK) { + int bitlen, bytelen; + + if ((i & ~INDIR_MASK) != EDNS0_ELT_BITLABEL) + return(NULL); /* unknown ELT */ + if (!ND_TTEST2(*cp, 1)) + return (NULL); + if ((bitlen = *cp++) == 0) + bitlen = 256; + bytelen = (bitlen + 7) / 8; + cp += bytelen; + } else + cp += i; + if (!ND_TTEST2(*cp, 1)) + return (NULL); i = *cp++; } return (cp); @@ -169,26 +82,101 @@ ns_nskip(register const u_char *cp, register const u_char *bp) /* print a */ static const u_char * -ns_nprint(register const u_char *cp, register const u_char *bp) +blabel_print(netdissect_options *ndo, + const u_char *cp) +{ + int bitlen, slen, b; + const u_char *bitp, *lim; + char tc; + + if (!ND_TTEST2(*cp, 1)) + return(NULL); + if ((bitlen = *cp) == 0) + bitlen = 256; + slen = (bitlen + 3) / 4; + lim = cp + 1 + slen; + + /* print the bit string as a hex string */ + ND_PRINT((ndo, "\\[x")); + for (bitp = cp + 1, b = bitlen; bitp < lim && b > 7; b -= 8, bitp++) { + ND_TCHECK(*bitp); + ND_PRINT((ndo, "%02x", *bitp)); + } + if (b > 4) { + ND_TCHECK(*bitp); + tc = *bitp++; + ND_PRINT((ndo, "%02x", tc & (0xff << (8 - b)))); + } else if (b > 0) { + ND_TCHECK(*bitp); + tc = *bitp++; + ND_PRINT((ndo, "%1x", ((tc >> 4) & 0x0f) & (0x0f << (4 - b)))); + } + ND_PRINT((ndo, "/%d]", bitlen)); + return lim; +trunc: + ND_PRINT((ndo, ".../%d]", bitlen)); + return NULL; +} + +static int +labellen(netdissect_options *ndo, + const u_char *cp) { register u_int i; - register const u_char *rp; - register int compress; + + if (!ND_TTEST2(*cp, 1)) + return(-1); + i = *cp; + if ((i & INDIR_MASK) == EDNS0_MASK) { + int bitlen, elt; + if ((elt = (i & ~INDIR_MASK)) != EDNS0_ELT_BITLABEL) { + ND_PRINT((ndo, "", elt)); + return(-1); + } + if (!ND_TTEST2(*(cp + 1), 1)) + return(-1); + if ((bitlen = *(cp + 1)) == 0) + bitlen = 256; + return(((bitlen + 7) / 8) + 1); + } else + return(i); +} + +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; int chars_processed; - int data_size = snapend - bp; + int elt; + int data_size = ndo->ndo_snapend - bp; - i = *cp++; + if ((l = labellen(ndo, cp)) == (u_int)-1) + return(NULL); + if (!ND_TTEST2(*cp, 1)) + return(NULL); chars_processed = 1; - rp = cp + i; - if ((i & INDIR_MASK) == INDIR_MASK) { - rp = cp + 1; - compress = 1; - } else + if (((i = *cp++) & INDIR_MASK) != INDIR_MASK) { 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 (!ND_TTEST2(*cp, 1)) + return(NULL); cp = bp + (((i << 8) | *cp) & 0x3fff); + if ((l = labellen(ndo, cp)) == (u_int)-1) + return(NULL); + if (!ND_TTEST2(*cp, 1)) + return(NULL); i = *cp++; chars_processed++; @@ -199,289 +187,564 @@ ns_nprint(register const u_char *cp, register const u_char *bp) * which means we're looping. */ if (chars_processed >= data_size) { - fn_printn(cp, 6, ""); - if (!compress) - rp += i + 1; - return (rp); + ND_PRINT((ndo, "")); + return (NULL); } continue; } - if (fn_printn(cp, i, snapend)) - break; - cp += i; - chars_processed += i; - putchar('.'); + if ((i & INDIR_MASK) == EDNS0_MASK) { + elt = (i & ~INDIR_MASK); + switch(elt) { + case EDNS0_ELT_BITLABEL: + if (blabel_print(ndo, cp) == NULL) + return (NULL); + break; + default: + /* unknown ELT */ + ND_PRINT((ndo, "", elt)); + return(NULL); + } + } else { + if (fn_printn(ndo, cp, l, ndo->ndo_snapend)) + return(NULL); + } + + cp += l; + chars_processed += l; + ND_PRINT((ndo, ".")); + if ((l = labellen(ndo, cp)) == (u_int)-1) + return(NULL); + if (!ND_TTEST2(*cp, 1)) + return(NULL); i = *cp++; chars_processed++; if (!compress) - rp += i + 1; + rp += l + 1; } else - putchar('.'); + ND_PRINT((ndo, ".")); return (rp); } /* print a */ static const u_char * -ns_cprint(register const u_char *cp, register const u_char *bp) +ns_cprint(netdissect_options *ndo, + register const u_char *cp) { register u_int i; + if (!ND_TTEST2(*cp, 1)) + return (NULL); i = *cp++; - (void)fn_printn(cp, i, snapend); + if (fn_printn(ndo, cp, i, ndo->ndo_snapend)) + return (NULL); return (cp + i); } -static struct tok type2str[] = { - { T_A, "A" }, - { T_NS, "NS" }, - { T_MD, "MD" }, - { T_MF, "MF" }, - { T_CNAME, "CNAME" }, - { T_SOA, "SOA" }, - { T_MB, "MB" }, - { T_MG, "MG" }, - { T_MR, "MR" }, - { T_NULL, "NULL" }, - { T_WKS, "WKS" }, - { T_PTR, "PTR" }, - { T_HINFO, "HINFO" }, - { T_MINFO, "MINFO" }, - { T_MX, "MX" }, - { T_TXT, "TXT" }, - { T_RP, "RP" }, - { T_AFSDB, "AFSDB" }, - { T_X25, "X25" }, - { T_ISDN, "ISDN" }, - { T_RT, "RT" }, - { T_NSAP, "NSAP" }, +/* http://www.iana.org/assignments/dns-parameters */ +const struct tok ns_type2str[] = { + { T_A, "A" }, /* RFC 1035 */ + { T_NS, "NS" }, /* RFC 1035 */ + { T_MD, "MD" }, /* RFC 1035 */ + { T_MF, "MF" }, /* RFC 1035 */ + { T_CNAME, "CNAME" }, /* RFC 1035 */ + { T_SOA, "SOA" }, /* RFC 1035 */ + { T_MB, "MB" }, /* RFC 1035 */ + { T_MG, "MG" }, /* RFC 1035 */ + { T_MR, "MR" }, /* RFC 1035 */ + { T_NULL, "NULL" }, /* RFC 1035 */ + { T_WKS, "WKS" }, /* RFC 1035 */ + { T_PTR, "PTR" }, /* RFC 1035 */ + { T_HINFO, "HINFO" }, /* RFC 1035 */ + { T_MINFO, "MINFO" }, /* RFC 1035 */ + { T_MX, "MX" }, /* RFC 1035 */ + { T_TXT, "TXT" }, /* RFC 1035 */ + { T_RP, "RP" }, /* RFC 1183 */ + { T_AFSDB, "AFSDB" }, /* RFC 1183 */ + { T_X25, "X25" }, /* RFC 1183 */ + { T_ISDN, "ISDN" }, /* RFC 1183 */ + { T_RT, "RT" }, /* RFC 1183 */ + { T_NSAP, "NSAP" }, /* RFC 1706 */ { T_NSAP_PTR, "NSAP_PTR" }, - { T_SIG, "SIG" }, - { T_KEY, "KEY" }, - { T_PX, "PX" }, - { T_GPOS, "GPOS" }, - { T_AAAA, "AAAA" }, - { T_LOC, "LOC " }, - { T_NXT, "NXT " }, - { T_EID, "EID " }, - { T_NIMLOC, "NIMLOC " }, - { T_SRV, "SRV " }, - { T_ATMA, "ATMA " }, - { T_NAPTR, "NAPTR " }, - { T_A6, "A6 " }, -#ifndef T_UINFO -#define T_UINFO 100 -#endif + { T_SIG, "SIG" }, /* RFC 2535 */ + { T_KEY, "KEY" }, /* RFC 2535 */ + { T_PX, "PX" }, /* RFC 2163 */ + { T_GPOS, "GPOS" }, /* RFC 1712 */ + { T_AAAA, "AAAA" }, /* RFC 1886 */ + { T_LOC, "LOC" }, /* RFC 1876 */ + { T_NXT, "NXT" }, /* RFC 2535 */ + { T_EID, "EID" }, /* Nimrod */ + { T_NIMLOC, "NIMLOC" }, /* Nimrod */ + { 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_SINK, "SINK" }, + { 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" }, -#ifndef T_UID -#define T_UID 101 -#endif { T_UID, "UID" }, -#ifndef T_GID -#define T_GID 102 -#endif { T_GID, "GID" }, { T_UNSPEC, "UNSPEC" }, { T_UNSPECA, "UNSPECA" }, - { T_AXFR, "AXFR" }, - { T_MAILB, "MAILB" }, - { T_MAILA, "MAILA" }, + { T_TKEY, "TKEY" }, /* RFC 2930 */ + { T_TSIG, "TSIG" }, /* RFC 2845 */ + { T_IXFR, "IXFR" }, /* RFC 1995 */ + { T_AXFR, "AXFR" }, /* RFC 1035 */ + { T_MAILB, "MAILB" }, /* RFC 1035 */ + { T_MAILA, "MAILA" }, /* RFC 1035 */ { T_ANY, "ANY" }, { 0, NULL } }; -static struct tok class2str[] = { +const struct tok ns_class2str[] = { { C_IN, "IN" }, /* Not used */ - { C_CHAOS, "CHAOS)" }, + { C_CHAOS, "CHAOS" }, { C_HS, "HS" }, { C_ANY, "ANY" }, { 0, NULL } }; /* print a query */ -static void -ns_qprint(register const u_char *cp, register const u_char *bp) +static const u_char * +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 u_int i; - - cp = ns_nskip(cp, bp); - - if (cp + 4 > snapend) - return; - - /* print the qtype and qclass (if it's not IN) */ - i = *cp++ << 8; - i |= *cp++; - printf(" %s", tok2str(type2str, "Type%d", i)); - i = *cp++ << 8; - i |= *cp++; - if (i != C_IN) - printf(" %s", tok2str(class2str, "(Class %d)", i)); + register u_int i, class; + + cp = ns_nskip(ndo, cp); + + if (cp == NULL || !ND_TTEST2(*cp, 4)) + return(NULL); + + /* print the qtype */ + i = EXTRACT_16BITS(cp); + cp += 2; + ND_PRINT((ndo, " %s", tok2str(ns_type2str, "Type%d", i))); + /* print the qclass (if it's not IN) */ + i = EXTRACT_16BITS(cp); + cp += 2; + 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); - 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 * -ns_rprint(register const u_char *cp, register const u_char *bp) +ns_rprint(netdissect_options *ndo, + register const u_char *cp, register const u_char *bp, int is_mdns) { - register u_int i; + register u_int i, class, opt_flags = 0; register u_short typ, len; register const u_char *rp; - if (vflag) { - putchar(' '); - cp = ns_nprint(cp, bp); + if (ndo->ndo_vflag) { + ND_PRINT((ndo, " ")); + if ((cp = ns_nprint(ndo, cp, bp)) == NULL) + return NULL; } else - cp = ns_nskip(cp, bp); - - if (cp + 10 > snapend) - return (snapend); - - /* print the type/qtype and class (if it's not IN) */ - typ = *cp++ << 8; - typ |= *cp++; - i = *cp++ << 8; - i |= *cp++; - if (i != C_IN) - printf(" %s", tok2str(class2str, "(Class %d)", i)); + cp = ns_nskip(ndo, cp); + + if (cp == NULL || !ND_TTEST2(*cp, 10)) + return (ndo->ndo_snapend); + + /* print the type/qtype */ + typ = EXTRACT_16BITS(cp); + cp += 2; + /* print the class (if it's not IN and the type isn't OPT) */ + i = EXTRACT_16BITS(cp); + cp += 2; + 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_16BITS(cp); + /* ignore rest of ttl field */ + cp += 2; + } else if (ndo->ndo_vflag > 2) { + /* print ttl */ + ND_PRINT((ndo, " [")); + relts_print(ndo, EXTRACT_32BITS(cp)); + ND_PRINT((ndo, "]")); + cp += 4; + } else { + /* ignore ttl */ + cp += 4; + } - len = *cp++ << 8; - len |= *cp++; + len = EXTRACT_16BITS(cp); + cp += 2; rp = cp + len; - printf(" %s", tok2str(type2str, "Type%d", typ)); - switch (typ) { + ND_PRINT((ndo, " %s", tok2str(ns_type2str, "Type%d", typ))); + if (rp > ndo->ndo_snapend) + return(NULL); + switch (typ) { case T_A: - printf(" %s", ipaddr_string(cp)); + if (!ND_TTEST2(*cp, sizeof(struct in_addr))) + return(NULL); + ND_PRINT((ndo, " %s", intoa(htonl(EXTRACT_32BITS(cp))))); break; case T_NS: case T_CNAME: case T_PTR: #ifdef T_DNAME - case T_DNAME: /*XXX not checked as there's no server support yet*/ + case T_DNAME: #endif - putchar(' '); - (void)ns_nprint(cp, bp); + ND_PRINT((ndo, " ")); + if (ns_nprint(ndo, cp, bp) == NULL) + return(NULL); break; + case T_SOA: + if (!ndo->ndo_vflag) + break; + ND_PRINT((ndo, " ")); + if ((cp = ns_nprint(ndo, cp, bp)) == NULL) + return(NULL); + ND_PRINT((ndo, " ")); + if ((cp = ns_nprint(ndo, cp, bp)) == NULL) + return(NULL); + if (!ND_TTEST2(*cp, 5 * 4)) + return(NULL); + ND_PRINT((ndo, " %u", EXTRACT_32BITS(cp))); + cp += 4; + ND_PRINT((ndo, " %u", EXTRACT_32BITS(cp))); + cp += 4; + ND_PRINT((ndo, " %u", EXTRACT_32BITS(cp))); + cp += 4; + ND_PRINT((ndo, " %u", EXTRACT_32BITS(cp))); + cp += 4; + ND_PRINT((ndo, " %u", EXTRACT_32BITS(cp))); + cp += 4; + break; case T_MX: - putchar(' '); - (void)ns_nprint(cp + 2, bp); - printf(" %d", EXTRACT_16BITS(cp)); + ND_PRINT((ndo, " ")); + if (!ND_TTEST2(*cp, 2)) + return(NULL); + if (ns_nprint(ndo, cp + 2, bp) == NULL) + return(NULL); + ND_PRINT((ndo, " %d", EXTRACT_16BITS(cp))); break; case T_TXT: - putchar(' '); - (void)ns_cprint(cp, bp); + while (cp < rp) { + ND_PRINT((ndo, " \"")); + cp = ns_cprint(ndo, cp); + if (cp == NULL) + return(NULL); + ND_PRINT((ndo, "\"")); + } + break; + + case T_SRV: + ND_PRINT((ndo, " ")); + if (!ND_TTEST2(*cp, 6)) + return(NULL); + if (ns_nprint(ndo, cp + 6, bp) == NULL) + return(NULL); + ND_PRINT((ndo, ":%d %d %d", EXTRACT_16BITS(cp + 4), + EXTRACT_16BITS(cp), EXTRACT_16BITS(cp + 2))); break; #ifdef INET6 case T_AAAA: - printf(" %s", ip6addr_string(cp)); + { + struct in6_addr addr; + char ntop_buf[INET6_ADDRSTRLEN]; + + if (!ND_TTEST2(*cp, sizeof(struct in6_addr))) + return(NULL); + memcpy(&addr, cp, sizeof(struct in6_addr)); + ND_PRINT((ndo, " %s", + inet_ntop(AF_INET6, &addr, ntop_buf, sizeof(ntop_buf)))); + break; + } - case T_A6: /*XXX not checked as there's no server support yet*/ + case T_A6: { struct in6_addr a; - int pbyte; - - pbyte = (*cp + 7) / 8; - memset(&a, 0, sizeof(a)); - memcpy(&a, cp + 1, pbyte); - printf(" %u %s ", *cp, ip6addr_string(&a)); - (void)ns_nprint(cp + 1 + pbyte, bp); + int pbit, pbyte; + char ntop_buf[INET6_ADDRSTRLEN]; + + if (!ND_TTEST2(*cp, 1)) + return(NULL); + pbit = *cp; + pbyte = (pbit & ~7) / 8; + if (pbit > 128) { + ND_PRINT((ndo, " %u(bad plen)", pbit)); + break; + } else if (pbit < 128) { + 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); + ND_PRINT((ndo, " %u %s", pbit, + inet_ntop(AF_INET6, &a, ntop_buf, sizeof(ntop_buf)))); + } + if (pbit > 0) { + ND_PRINT((ndo, " ")); + if (ns_nprint(ndo, cp + 1 + sizeof(a) - pbyte, bp) == NULL) + return(NULL); + } break; } #endif /*INET6*/ + case T_OPT: + ND_PRINT((ndo, " UDPsize=%u", class)); + if (opt_flags & 0x8000) + ND_PRINT((ndo, " OK")); + break; + case T_UNSPECA: /* One long string */ - printf(" %.*s", len, cp); + if (!ND_TTEST2(*cp, len)) + return(NULL); + if (fn_printn(ndo, cp, len, ndo->ndo_snapend)) + return(NULL); break; + + case T_TSIG: + { + if (cp + len > ndo->ndo_snapend) + return(NULL); + if (!ndo->ndo_vflag) + break; + ND_PRINT((ndo, " ")); + if ((cp = ns_nprint(ndo, cp, bp)) == NULL) + return(NULL); + cp += 6; + if (!ND_TTEST2(*cp, 2)) + return(NULL); + ND_PRINT((ndo, " fudge=%u", EXTRACT_16BITS(cp))); + cp += 2; + if (!ND_TTEST2(*cp, 2)) + return(NULL); + ND_PRINT((ndo, " maclen=%u", EXTRACT_16BITS(cp))); + cp += 2 + EXTRACT_16BITS(cp); + if (!ND_TTEST2(*cp, 2)) + return(NULL); + ND_PRINT((ndo, " origid=%u", EXTRACT_16BITS(cp))); + cp += 2; + if (!ND_TTEST2(*cp, 2)) + return(NULL); + ND_PRINT((ndo, " error=%u", EXTRACT_16BITS(cp))); + cp += 2; + if (!ND_TTEST2(*cp, 2)) + return(NULL); + ND_PRINT((ndo, " otherlen=%u", EXTRACT_16BITS(cp))); + cp += 2; + } } return (rp); /* XXX This isn't always right */ } void -ns_print(register const u_char *bp, u_int length) +ns_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; + uint16_t b2; np = (const HEADER *)bp; + ND_TCHECK(*np); /* get the byte-order right */ - qdcount = ntohs(np->qdcount); - ancount = ntohs(np->ancount); - nscount = ntohs(np->nscount); - arcount = ntohs(np->arcount); + qdcount = EXTRACT_16BITS(&np->qdcount); + ancount = EXTRACT_16BITS(&np->ancount); + nscount = EXTRACT_16BITS(&np->nscount); + arcount = EXTRACT_16BITS(&np->arcount); - if (np->qr) { + if (DNS_QR(np)) { /* this is a response */ - printf(" %d%s%s%s%s%s%s", - ntohs(np->id), - ns_ops[np->opcode], - ns_resp[np->rcode], - np->aa? "*" : "", - np->ra? "" : "-", - np->tc? "|" : "", - np->cd? "%" : ""); + ND_PRINT((ndo, "%d%s%s%s%s%s%s", + EXTRACT_16BITS(&np->id), + ns_ops[DNS_OPCODE(np)], + ns_resp[DNS_RCODE(np)], + DNS_AA(np)? "*" : "", + DNS_RA(np)? "" : "-", + DNS_TC(np)? "|" : "", + DNS_AD(np)? "$" : "")); if (qdcount != 1) - printf(" [%dq]", qdcount); + ND_PRINT((ndo, " [%dq]", qdcount)); /* Print QUESTION section on -vv */ - if (vflag > 1) { - fputs(" q: ", stdout); - cp = ns_nprint((const u_char *)(np + 1), bp); - } else - cp = ns_nskip((const u_char *)(np + 1), bp); - printf(" %d/%d/%d", ancount, nscount, arcount); + cp = (const u_char *)(np + 1); + while (qdcount--) { + if (qdcount < EXTRACT_16BITS(&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 { + if ((cp = ns_nskip(ndo, cp)) == NULL) + goto trunc; + cp += 4; /* skip QTYPE and QCLASS */ + } + } + ND_PRINT((ndo, " %d/%d/%d", ancount, nscount, arcount)); if (ancount--) { - cp = ns_rprint(cp + 4, bp); - while (ancount-- && cp < snapend) { - putchar(','); - cp = ns_rprint(cp, bp); + if ((cp = ns_rprint(ndo, cp, bp, is_mdns)) == NULL) + goto trunc; + 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 */ + 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; + 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; + if (cp < ndo->ndo_snapend && arcount--) { + ND_PRINT((ndo, " ar:")); + if ((cp = ns_rprint(ndo, cp, bp, is_mdns)) == NULL) + goto trunc; + while (cp < ndo->ndo_snapend && arcount--) { + ND_PRINT((ndo, ",")); + if ((cp = ns_rprint(ndo, cp, bp, is_mdns)) == NULL) + goto trunc; + } + } + if (arcount > 0) + goto trunc; + } } else { /* this is a request */ - printf(" %d%s%s%s", - ntohs(np->id), - ns_ops[np->opcode], - np->rd? "+" : "", - np->ad? "$" : ""); + ND_PRINT((ndo, "%d%s%s%s", EXTRACT_16BITS(&np->id), ns_ops[DNS_OPCODE(np)], + DNS_RD(np) ? "+" : "", + DNS_CD(np) ? "%" : "")); /* any weirdness? */ - if (*(((u_short *)np)+1) & htons(0x6cf)) - printf(" [b2&3=0x%x]", ntohs(*(((u_short *)np)+1))); + b2 = EXTRACT_16BITS(((u_short *)np)+1); + if (b2 & 0x6cf) + ND_PRINT((ndo, " [b2&3=0x%x]", b2)); - if (np->opcode == IQUERY) { + if (DNS_OPCODE(np) == IQUERY) { if (qdcount) - printf(" [%dq]", qdcount); + ND_PRINT((ndo, " [%dq]", qdcount)); if (ancount != 1) - printf(" [%da]", ancount); + ND_PRINT((ndo, " [%da]", ancount)); } else { if (ancount) - printf(" [%da]", ancount); + ND_PRINT((ndo, " [%da]", ancount)); if (qdcount != 1) - printf(" [%dq]", qdcount); + ND_PRINT((ndo, " [%dq]", qdcount)); } if (nscount) - printf(" [%dn]", nscount); + ND_PRINT((ndo, " [%dn]", nscount)); if (arcount) - printf(" [%dau]", arcount); - - ns_qprint((const u_char *)(np + 1), (const u_char *)np); + ND_PRINT((ndo, " [%dau]", arcount)); + + cp = (const u_char *)(np + 1); + if (qdcount--) { + cp = ns_qprint(ndo, cp, (const u_char *)np, is_mdns); + if (!cp) + goto trunc; + while (cp < ndo->ndo_snapend && qdcount--) { + cp = ns_qprint(ndo, (const u_char *)cp, + (const u_char *)np, + is_mdns); + if (!cp) + goto trunc; + } + } + if (qdcount > 0) + goto trunc; + + /* Print remaining sections on -vv */ + if (ndo->ndo_vflag > 1) { + if (ancount--) { + if ((cp = ns_rprint(ndo, cp, bp, is_mdns)) == NULL) + goto trunc; + 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; + if (cp < ndo->ndo_snapend && nscount--) { + ND_PRINT((ndo, " ns:")); + if ((cp = ns_rprint(ndo, cp, bp, is_mdns)) == NULL) + goto trunc; + 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; + if (cp < ndo->ndo_snapend && arcount--) { + ND_PRINT((ndo, " ar:")); + if ((cp = ns_rprint(ndo, cp, bp, is_mdns)) == NULL) + goto trunc; + while (cp < ndo->ndo_snapend && arcount--) { + ND_PRINT((ndo, ",")); + if ((cp = ns_rprint(ndo, cp, bp, is_mdns)) == NULL) + goto trunc; + } + } + if (arcount > 0) + goto trunc; + } } - printf(" (%d)", length); + ND_PRINT((ndo, " (%d)", length)); + return; + + trunc: + ND_PRINT((ndo, "[|domain]")); }