#include <netdissect-stdinc.h>
-#include "nameser.h"
-
#include <string.h>
#include "netdissect.h"
#include "addrtostr.h"
#include "extract.h"
+#include "nameser.h"
+
static const char *ns_ops[] = {
"", " inv_q", " stat", " op3", " notify", " update", " op6", " op7",
" op8", " updateA", " updateD", " updateDA",
/* skip over a domain name */
static const u_char *
ns_nskip(netdissect_options *ndo,
- register const u_char *cp)
+ const u_char *cp)
{
- register u_char i;
+ u_char i;
if (!ND_TTEST_1(cp))
return (NULL);
/* 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));
+ ND_TCHECK_1(bitp);
+ ND_PRINT((ndo, "%02x", EXTRACT_U_1(bitp)));
}
if (b > 4) {
- ND_TCHECK(*bitp);
+ ND_TCHECK_1(bitp);
tc = EXTRACT_U_1(bitp);
bitp++;
ND_PRINT((ndo, "%02x", tc & (0xff << (8 - b))));
} else if (b > 0) {
- ND_TCHECK(*bitp);
+ ND_TCHECK_1(bitp);
tc = EXTRACT_U_1(bitp);
bitp++;
ND_PRINT((ndo, "%1x", ((tc >> 4) & 0x0f) & (0x0f << (4 - b))));
labellen(netdissect_options *ndo,
const u_char *cp)
{
- register u_int i;
+ u_int i;
if (!ND_TTEST_1(cp))
return(-1);
const u_char *
ns_nprint(netdissect_options *ndo,
- register const u_char *cp, register const u_char *bp)
+ const u_char *cp, const u_char *bp)
{
- register u_int i, l;
- register const u_char *rp = NULL;
- register int compress = 0;
+ u_int i, l;
+ const u_char *rp = NULL;
+ int compress = 0;
int elt;
u_int offset, max_offset;
/* print a <character-string> */
static const u_char *
ns_cprint(netdissect_options *ndo,
- register const u_char *cp)
+ const u_char *cp)
{
- register u_int i;
+ u_int i;
if (!ND_TTEST_1(cp))
return (NULL);
return (cp + i);
}
+extern const struct tok ns_type2str[];
+
/* http://www.iana.org/assignments/dns-parameters */
const struct tok ns_type2str[] = {
{ T_A, "A" }, /* RFC 1035 */
{ 0, NULL }
};
+extern const struct tok ns_class2str[];
+
const struct tok ns_class2str[] = {
{ C_IN, "IN" }, /* Not used */
{ C_CHAOS, "CHAOS" },
/* print a query */
static const u_char *
ns_qprint(netdissect_options *ndo,
- register const u_char *cp, register const u_char *bp, int is_mdns)
+ const u_char *cp, const u_char *bp, int is_mdns)
{
- register const u_char *np = cp;
- register u_int i, class;
+ const u_char *np = cp;
+ u_int i, class;
cp = ns_nskip(ndo, cp);
- if (cp == NULL || !ND_TTEST2(*cp, 4))
+ if (cp == NULL || !ND_TTEST_4(cp))
return(NULL);
/* print the qtype */
/* print a reply */
static const u_char *
ns_rprint(netdissect_options *ndo,
- register const u_char *cp, register const u_char *bp, int is_mdns)
+ const u_char *cp, const u_char *bp, int is_mdns)
{
- register u_int i, class, opt_flags = 0;
- register u_short typ, len;
- register const u_char *rp;
+ u_int i, class, opt_flags = 0;
+ u_short typ, len;
+ const u_char *rp;
if (ndo->ndo_vflag) {
ND_PRINT((ndo, " "));
} else
cp = ns_nskip(ndo, cp);
- if (cp == NULL || !ND_TTEST2(*cp, 10))
+ if (cp == NULL || !ND_TTEST_LEN(cp, 10))
return (ndo->ndo_snapend);
/* print the type/qtype */
switch (typ) {
case T_A:
- if (!ND_TTEST2(*cp, sizeof(struct in_addr)))
+ if (!ND_TTEST_LEN(cp, sizeof(struct in_addr)))
return(NULL);
ND_PRINT((ndo, " %s", intoa(htonl(EXTRACT_BE_U_4(cp)))));
break;
ND_PRINT((ndo, " "));
if ((cp = ns_nprint(ndo, cp, bp)) == NULL)
return(NULL);
- if (!ND_TTEST2(*cp, 5 * 4))
+ if (!ND_TTEST_LEN(cp, 5 * 4))
return(NULL);
ND_PRINT((ndo, " %u", EXTRACT_BE_U_4(cp)));
cp += 4;
break;
case T_MX:
ND_PRINT((ndo, " "));
- if (!ND_TTEST2(*cp, 2))
+ if (!ND_TTEST_2(cp))
return(NULL);
if (ns_nprint(ndo, cp + 2, bp) == NULL)
return(NULL);
case T_SRV:
ND_PRINT((ndo, " "));
- if (!ND_TTEST2(*cp, 6))
+ if (!ND_TTEST_6(cp))
return(NULL);
if (ns_nprint(ndo, cp + 6, bp) == NULL)
return(NULL);
{
char ntop_buf[INET6_ADDRSTRLEN];
- if (!ND_TTEST2(*cp, sizeof(struct in6_addr)))
+ if (!ND_TTEST_LEN(cp, sizeof(struct in6_addr)))
return(NULL);
ND_PRINT((ndo, " %s",
addrtostr6(cp, ntop_buf, sizeof(ntop_buf))));
ND_PRINT((ndo, " %u(bad plen)", pbit));
break;
} else if (pbit < 128) {
- if (!ND_TTEST2(*(cp + 1), sizeof(a) - pbyte))
+ if (!ND_TTEST_LEN(cp + 1, sizeof(a) - pbyte))
return(NULL);
memset(&a, 0, sizeof(a));
memcpy(&a.s6_addr[pbyte], cp + 1, sizeof(a) - pbyte);
break;
case T_UNSPECA: /* One long string */
- if (!ND_TTEST2(*cp, len))
+ if (!ND_TTEST_LEN(cp, len))
return(NULL);
if (fn_printn(ndo, cp, len, ndo->ndo_snapend))
return(NULL);
void
domain_print(netdissect_options *ndo,
- register const u_char *bp, u_int length, int is_mdns)
+ 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;
+ const HEADER *np;
+ uint16_t flags;
+ u_int qdcount, ancount, nscount, arcount;
+ u_int i;
+ const u_char *cp;
uint16_t b2;
np = (const HEADER *)bp;
ND_TCHECK(*np);
+ flags = EXTRACT_BE_U_2(np->flags);
/* get the byte-order right */
- 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);
+ 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)) {
+ if (DNS_QR(flags)) {
/* this is a response */
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)? "|" : "",
- DNS_AD(np)? "$" : ""));
+ EXTRACT_BE_U_2(np->id),
+ ns_ops[DNS_OPCODE(flags)],
+ ns_resp[DNS_RCODE(flags)],
+ DNS_AA(flags)? "*" : "",
+ DNS_RA(flags)? "" : "-",
+ DNS_TC(flags)? "|" : "",
+ DNS_AD(flags)? "$" : ""));
if (qdcount != 1)
- ND_PRINT((ndo, " [%dq]", qdcount));
+ ND_PRINT((ndo, " [%uq]", qdcount));
/* Print QUESTION section on -vv */
cp = (const u_char *)(np + 1);
- while (qdcount--) {
- if (qdcount < EXTRACT_BE_U_2(&np->qdcount) - 1)
+ for (i = 0; i < qdcount; i++) {
+ if (i != 0)
ND_PRINT((ndo, ","));
if (ndo->ndo_vflag > 1) {
ND_PRINT((ndo, " q:"));
cp += 4; /* skip QTYPE and QCLASS */
}
}
- ND_PRINT((ndo, " %d/%d/%d", ancount, nscount, arcount));
- if (ancount--) {
+ ND_PRINT((ndo, " %u/%u/%u", ancount, nscount, arcount));
+ if (ancount) {
if ((cp = ns_rprint(ndo, cp, bp, is_mdns)) == NULL)
goto trunc;
- while (cp < ndo->ndo_snapend && ancount--) {
+ ancount--;
+ while (cp < ndo->ndo_snapend && ancount) {
ND_PRINT((ndo, ","));
if ((cp = ns_rprint(ndo, cp, bp, is_mdns)) == NULL)
goto trunc;
+ ancount--;
}
}
- if (ancount > 0)
+ if (ancount)
goto trunc;
/* Print NS and AR sections on -vv */
if (ndo->ndo_vflag > 1) {
- if (cp < ndo->ndo_snapend && nscount--) {
+ 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--) {
+ nscount--;
+ while (cp < ndo->ndo_snapend && nscount) {
ND_PRINT((ndo, ","));
if ((cp = ns_rprint(ndo, cp, bp, is_mdns)) == NULL)
goto trunc;
+ nscount--;
}
}
- if (nscount > 0)
+ if (nscount)
goto trunc;
- if (cp < ndo->ndo_snapend && arcount--) {
+ 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--) {
+ arcount--;
+ while (cp < ndo->ndo_snapend && arcount) {
ND_PRINT((ndo, ","));
if ((cp = ns_rprint(ndo, cp, bp, is_mdns)) == NULL)
goto trunc;
+ arcount--;
}
}
- if (arcount > 0)
+ if (arcount)
goto trunc;
}
}
else {
/* this is a request */
- ND_PRINT((ndo, "%d%s%s%s", EXTRACT_BE_U_2(&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(flags)],
+ DNS_RD(flags) ? "+" : "",
+ DNS_CD(flags) ? "%" : ""));
/* any weirdness? */
b2 = EXTRACT_BE_U_2(((const u_short *)np) + 1);
if (b2 & 0x6cf)
ND_PRINT((ndo, " [b2&3=0x%x]", b2));
- if (DNS_OPCODE(np) == IQUERY) {
+ if (DNS_OPCODE(flags) == IQUERY) {
if (qdcount)
- ND_PRINT((ndo, " [%dq]", qdcount));
+ ND_PRINT((ndo, " [%uq]", qdcount));
if (ancount != 1)
- ND_PRINT((ndo, " [%da]", ancount));
+ ND_PRINT((ndo, " [%ua]", ancount));
}
else {
if (ancount)
- ND_PRINT((ndo, " [%da]", ancount));
+ ND_PRINT((ndo, " [%ua]", ancount));
if (qdcount != 1)
- ND_PRINT((ndo, " [%dq]", qdcount));
+ ND_PRINT((ndo, " [%uq]", qdcount));
}
if (nscount)
- ND_PRINT((ndo, " [%dn]", nscount));
+ ND_PRINT((ndo, " [%un]", nscount));
if (arcount)
- ND_PRINT((ndo, " [%dau]", arcount));
+ ND_PRINT((ndo, " [%uau]", arcount));
cp = (const u_char *)(np + 1);
- if (qdcount--) {
+ if (qdcount) {
cp = ns_qprint(ndo, cp, (const u_char *)np, is_mdns);
if (!cp)
goto trunc;
- while (cp < ndo->ndo_snapend && qdcount--) {
+ qdcount--;
+ while (cp < ndo->ndo_snapend && qdcount) {
cp = ns_qprint(ndo, (const u_char *)cp,
(const u_char *)np,
is_mdns);
if (!cp)
goto trunc;
+ qdcount--;
}
}
- if (qdcount > 0)
+ if (qdcount)
goto trunc;
/* Print remaining sections on -vv */
if (ndo->ndo_vflag > 1) {
- if (ancount--) {
+ if (ancount) {
if ((cp = ns_rprint(ndo, cp, bp, is_mdns)) == NULL)
goto trunc;
- while (cp < ndo->ndo_snapend && ancount--) {
+ ancount--;
+ while (cp < ndo->ndo_snapend && ancount) {
ND_PRINT((ndo, ","));
if ((cp = ns_rprint(ndo, cp, bp, is_mdns)) == NULL)
goto trunc;
+ ancount--;
}
}
- if (ancount > 0)
+ if (ancount)
goto trunc;
- if (cp < ndo->ndo_snapend && nscount--) {
+ 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) {
+ nscount--;
+ while (cp < ndo->ndo_snapend && nscount) {
ND_PRINT((ndo, ","));
if ((cp = ns_rprint(ndo, cp, bp, is_mdns)) == NULL)
goto trunc;
+ nscount--;
}
}
if (nscount > 0)
goto trunc;
- if (cp < ndo->ndo_snapend && arcount--) {
+ 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--) {
+ arcount--;
+ while (cp < ndo->ndo_snapend && arcount) {
ND_PRINT((ndo, ","));
if ((cp = ns_rprint(ndo, cp, bp, is_mdns)) == NULL)
goto trunc;
+ arcount--;
}
}
- if (arcount > 0)
+ if (arcount)
goto trunc;
}
}
projects / tcpdump / blobdiff