#ifndef lint
static const char rcsid[] =
- "@(#) $Header: /tcpdump/master/tcpdump/print-domain.c,v 1.66 2001-01-28 07:47:56 itojun Exp $ (LBL)";
+ "@(#) $Header: /tcpdump/master/tcpdump/print-domain.c,v 1.75 2001-02-23 08:55:21 guy Exp $ (LBL)";
#endif
#ifdef HAVE_CONFIG_H
#include "extract.h" /* must come after interface.h */
static char *ns_ops[] = {
- "", " inv_q", " stat", " op3", " notify", " op5", " op6", " op7",
+ "", " inv_q", " stat", " op3", " notify", " update", " op6", " op7",
" op8", " updataA", " updateD", " updateDA",
" updateM", " updateMA", " zoneInit", " zoneRef",
};
static 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",
};
{
register u_char i;
+ if (!TTEST2(*cp, 1))
+ return (NULL);
if (((i = *cp++) & INDIR_MASK) == INDIR_MASK)
return (cp + 1);
- if (cp >= snapend)
- return(NULL);
- while (i && cp < snapend) {
+ while (i) {
if ((i & INDIR_MASK) == EDNS0_MASK) {
int bitlen, bytelen;
if ((i & ~INDIR_MASK) != EDNS0_ELT_BITLABEL)
return(NULL); /* unknown ELT */
+ if (!TTEST2(*cp, 1))
+ return (NULL);
if ((bitlen = *cp++) == 0)
bitlen = 256;
bytelen = (bitlen + 7) / 8;
cp += bytelen;
} else
cp += i;
- if (cp >= snapend)
- return(NULL);
+ if (!TTEST2(*cp, 1))
+ return (NULL);
i = *cp++;
}
return (cp);
const u_char *bitp, *lim;
char tc;
- if (cp >= snapend)
+ if (!TTEST2(*cp, 1))
return(NULL);
if ((bitlen = *cp) == 0)
bitlen = 256;
{
register u_int i;
- if (cp >= snapend)
+ if (!TTEST2(*cp, 1))
return(-1);
i = *cp;
if ((i & INDIR_MASK) == EDNS0_MASK) {
if ((elt = (i & ~INDIR_MASK)) != EDNS0_ELT_BITLABEL)
return(-1);
- if (cp + 1 >= snapend)
+ if (!TTEST2(*(cp + 1), 1))
return(-1);
if ((bitlen = *(cp + 1)) == 0)
bitlen = 256;
if ((l = labellen(cp)) < 0)
return(NULL);
- if (cp >= snapend)
+ if (!TTEST2(*cp, 1))
return(NULL);
chars_processed = 1;
if (((i = *cp++) & INDIR_MASK) != INDIR_MASK) {
rp = cp + 1;
compress = 1;
}
- cp = bp + (((i << 8) | *cp) & 0x3fff);
- if (cp >= snapend)
+ if (!TTEST2(*cp, 1))
return(NULL);
+ cp = bp + (((i << 8) | *cp) & 0x3fff);
if ((l = labellen(cp)) < 0)
return(NULL);
+ if (!TTEST2(*cp, 1))
+ return(NULL);
i = *cp++;
chars_processed++;
elt = (i & ~INDIR_MASK);
switch(elt) {
case EDNS0_ELT_BITLABEL:
- blabel_print(cp);
+ if (blabel_print(cp) == NULL)
+ return (NULL);
break;
default:
/* unknown ELT */
}
} else {
if (fn_printn(cp, l, snapend))
- break;
+ return(NULL);
}
cp += l;
chars_processed += l;
putchar('.');
- if (cp >= snapend || (l = labellen(cp)) < 0)
+ if ((l = labellen(cp)) < 0)
+ return(NULL);
+ if (!TTEST2(*cp, 1))
return(NULL);
i = *cp++;
chars_processed++;
{
register u_int i;
- if (cp >= snapend)
- return NULL;
+ if (!TTEST2(*cp, 1))
+ return (NULL);
i = *cp++;
- (void)fn_printn(cp, i, snapend);
+ if (fn_printn(cp, i, snapend))
+ return (NULL);
return (cp + i);
}
-static struct tok type2str[] = {
+struct tok ns_type2str[] = {
{ T_A, "A" },
{ T_NS, "NS" },
{ T_MD, "MD" },
{ 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 " },
- { T_DNAME, "DNAME " },
- { T_OPT, "OPT " },
+ { T_LOC, "LOC" },
+ { T_NXT, "NXT" },
+ { T_EID, "EID" },
+ { T_NIMLOC, "NIMLOC" },
+ { T_SRV, "SRV" },
+ { T_ATMA, "ATMA" },
+ { T_NAPTR, "NAPTR" },
+ { T_A6, "A6" },
+ { T_DNAME, "DNAME" },
+ { T_OPT, "OPT" },
{ T_UINFO, "UINFO" },
{ T_UID, "UID" },
{ T_GID, "GID" },
{ T_UNSPEC, "UNSPEC" },
{ T_UNSPECA, "UNSPECA" },
+ { T_TKEY, "TKEY" },
+ { T_TSIG, "TSIG" },
+ { T_IXFR, "IXFR" },
{ T_AXFR, "AXFR" },
{ T_MAILB, "MAILB" },
{ T_MAILA, "MAILA" },
{ 0, NULL }
};
-static struct tok class2str[] = {
+struct tok ns_class2str[] = {
{ C_IN, "IN" }, /* Not used */
- { C_CHAOS, "CHAOS)" },
+ { C_CHAOS, "CHAOS" },
{ C_HS, "HS" },
{ C_ANY, "ANY" },
{ 0, NULL }
cp = ns_nskip(cp, bp);
- if (cp + 4 > snapend || cp == NULL)
+ if (cp == NULL || !TTEST2(*cp, 4))
return(NULL);
/* print the qtype and qclass (if it's not IN) */
i = *cp++ << 8;
i |= *cp++;
- printf(" %s", tok2str(type2str, "Type%d", i));
+ printf(" %s", tok2str(ns_type2str, "Type%d", i));
i = *cp++ << 8;
i |= *cp++;
if (i != C_IN)
- printf(" %s", tok2str(class2str, "(Class %d)", i));
+ printf(" %s", tok2str(ns_class2str, "(Class %d)", i));
fputs("? ", stdout);
cp = ns_nprint(np, bp);
} else
cp = ns_nskip(cp, bp);
- if (cp + 10 > snapend || cp == NULL)
+ if (cp == NULL || !TTEST2(*cp, 10))
return (snapend);
/* print the type/qtype and class (if it's not IN) */
class = *cp++ << 8;
class |= *cp++;
if (class != C_IN && typ != T_OPT)
- printf(" %s", tok2str(class2str, "(Class %d)", class));
+ printf(" %s", tok2str(ns_class2str, "(Class %d)", class));
/* ignore ttl */
cp += 4;
rp = cp + len;
- printf(" %s", tok2str(type2str, "Type%d", typ));
+ printf(" %s", tok2str(ns_type2str, "Type%d", typ));
if (rp > snapend)
return(NULL);
switch (typ) {
case T_A:
- if (cp + sizeof(struct in_addr) > snapend)
+ if (!TTEST2(*cp, sizeof(struct in_addr)))
return(NULL);
printf(" %s", ipaddr_string(cp));
break;
putchar(' ');
if ((cp = ns_nprint(cp, bp)) == NULL)
return(NULL);
- if (cp + 5 * 4 > snapend)
+ if (!TTEST2(*cp, 5 * 4))
return(NULL);
printf(" %u", EXTRACT_32BITS(cp));
cp += 4;
break;
case T_MX:
putchar(' ');
- if (cp + 2 > snapend)
+ if (!TTEST2(*cp, 2))
return(NULL);
if (ns_nprint(cp + 2, bp) == NULL)
return(NULL);
#ifdef INET6
case T_AAAA:
- if (cp + sizeof(struct in6_addr) > snapend)
+ if (!TTEST2(*cp, sizeof(struct in6_addr)))
return(NULL);
printf(" %s", ip6addr_string(cp));
break;
struct in6_addr a;
int pbit, pbyte;
+ if (!TTEST2(*cp, 1))
+ return(NULL);
pbit = *cp;
pbyte = (pbit & ~7) / 8;
if (pbit > 128) {
printf(" %u(bad plen)", pbit);
break;
} else if (pbit < 128) {
+ if (!TTEST2(*(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));
break;
case T_UNSPECA: /* One long string */
- if (cp + len > snapend)
+ if (!TTEST2(*cp, len))
+ return(NULL);
+ if (fn_printn(cp, len, snapend))
return(NULL);
- fn_printn(cp, len, snapend);
break;
+
+ case T_TSIG:
+ {
+ if (cp + len > snapend)
+ return(NULL);
+ if (!vflag)
+ break;
+ putchar(' ');
+ if ((cp = ns_nprint(cp, bp)) == NULL)
+ return(NULL);
+ cp += 6;
+ if (!TTEST2(*cp, 2))
+ return(NULL);
+ printf(" fudge=%u", EXTRACT_16BITS(cp));
+ cp += 2;
+ if (!TTEST2(*cp, 2))
+ return(NULL);
+ printf(" maclen=%u", EXTRACT_16BITS(cp));
+ cp += 2 + EXTRACT_16BITS(cp);
+ if (!TTEST2(*cp, 2))
+ return(NULL);
+ printf(" origid=%u", EXTRACT_16BITS(cp));
+ cp += 2;
+ if (!TTEST2(*cp, 2))
+ return(NULL);
+ printf(" error=%u", EXTRACT_16BITS(cp));
+ cp += 2;
+ if (!TTEST2(*cp, 2))
+ return(NULL);
+ printf(" otherlen=%u", EXTRACT_16BITS(cp));
+ cp += 2;
+ }
}
return (rp); /* XXX This isn't always right */
}
register const u_char *cp = NULL;
np = (const HEADER *)bp;
+ TCHECK(*np);
/* get the byte-order right */
qdcount = ntohs(np->qdcount);
ancount = ntohs(np->ancount);
if (qdcount != 1)
printf(" [%dq]", qdcount);
/* Print QUESTION section on -vv */
- if (vflag > 1) {
- fputs(" q:", stdout);
- if ((cp = ns_qprint((const u_char *)(np + 1), bp))
- == NULL)
- goto trunc;
- } else {
- if ((cp = ns_nskip((const u_char *)(np + 1), bp))
- == NULL)
- goto trunc;
- cp += 4;
+ cp = (const u_char *)(np + 1);
+ while (qdcount--) {
+ if (qdcount < ntohs(np->qdcount) - 1)
+ putchar(',');
+ if (vflag > 1) {
+ fputs(" q:", stdout);
+ if ((cp = ns_qprint((const u_char *)(np + 1), bp))
+ == NULL)
+ goto trunc;
+ } else {
+ if ((cp = ns_nskip((const u_char *)(np + 1), bp))
+ == NULL)
+ goto trunc;
+ cp += 4; /* skip QTYPE and QCLASS */
+ }
}
printf(" %d/%d/%d", ancount, nscount, arcount);
if (ancount--) {
projects / tcpdump / blobdiff