mirrors/tcpdump
0
0
Fork 0
mirror of https://github.com/the-tcpdump-group/tcpdump.git synced 2024-12-12 19:33:43 +08:00
Code Issues Packages Projects Releases Wiki Activity
dcf83034e0
tcpdump/print-domain.c

840 lines
19 KiB
C
Raw Normal View History

Initial revision
1999-10-08 07:47:09 +08:00
/*
* Copyright (c) 1988, 1989, 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1997
* The Regents of the University of California. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that: (1) source code distributions
* retain the above copyright notice and this paragraph in its entirety, (2)
* distributions including binary code include the above copyright notice and
* this paragraph in its entirety in the documentation or other materials
* provided with the distribution, and (3) all advertising materials mentioning
* features or use of this software display the following acknowledgement:
* ``This product includes software developed by the University of California,
* Lawrence Berkeley Laboratory and its contributors.'' Neither the name of
* the University nor the names of its contributors may be used to endorse
* or promote products derived from this software without specific prior
* written permission.
* THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR IMPLIED
* WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF
* MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
*/
Move the printer summaries from INSTALL.txt to each printer with the tag '\summary:' for greping. Remark: Currently some printers have no summary line. Moreover: Summarize all printers with a single line in INSTALL.txt
2016-08-14 21:42:19 +08:00
/* \summary: Domain Name System (DNS) printer */
Switch to config.h instead of passing defines in DEFS.
1999-11-21 17:36:43 +08:00
#ifdef HAVE_CONFIG_H
Always include <config.h> rather than "config.h". This can prevent bizarre failures if, for example, you've done a configuration in the top-level source directory, leaving behind one config.h file, and then do an out-of-tree build in another directory, with different configuration options. This way, we always pick up the same config.h, in the build directory.
2018-01-22 04:27:08 +08:00
#include <config.h>
Initial revision
1999-10-08 07:47:09 +08:00
#endif
Use quoted include netdissect-stdinc.h instead of angle-bracketed one
2018-01-20 22:59:49 +08:00
#include "netdissect-stdinc.h"
Initial revision
1999-10-08 07:47:09 +08:00
Bring in KAME IPv6 tcpdump. replaces esp/ah/isakmp decoder. Hope I did not break anything. Portability on IPv4-only node needs checking, I'll do this very soon. (sorry for rather jumbo commit) XXx what is _FAVOR_BSD?
1999-10-30 13:11:06 +08:00
#include <string.h>
Initial revision
1999-10-08 07:47:09 +08:00
Printers must include 'netdissect.h', not 'interface.h'
2015-09-06 05:35:58 +08:00
#include "netdissect.h"
Initial revision
1999-10-08 07:47:09 +08:00
#include "addrtoname.h"
Don't require IPv6 library support in order to support IPv6 addresses. Have our own routines to convert between IPv4/IPv6 addresses and strings; that helps if, for example, we want to build binary versions of tcpdump for Windows that can run both on NT 5 (W2K/WXP), which doesn't have inet_ntop() or inet_pton(), and NT 6 (Vista/7/8/10), which do. It also means that we don't require IPv6 library support on UN*X to print addresses (if somebody wants to build tcpdump for older UN*Xes lacking IPv6 support in the system library or in add-on libraries). Get rid of files in the missing directory that we don't need, and various no-longer-necessary autoconf tests.
2015-09-18 05:56:44 +08:00
#include "addrtostr.h"
Remove obsolete comments
2015-09-07 21:01:46 +08:00
#include "extract.h"
Initial revision
1999-10-08 07:47:09 +08:00
Use nd_ types for DNS. Make some types unsigned, and fix some loops to no longer depend on a zero count rolling over to -1 when decremented.
2017-12-14 01:32:44 +08:00
#include "nameser.h"
Eliminate some unused parameters. Use const more. Use EXTRACT_* macros more. Use TCHECK* more. Use tok2str() to replace some home-grown workalikes. smb: - Get rid of private types, use tcpdump-defined types - Rename fdata and fdata1 to smb_fdata and smb_fdata1 to avoid conflict with IRIX library function.
2001-09-18 05:57:50 +08:00
static const char *ns_ops[] = {
print dynamic update a little bit better
2001-02-20 14:22:57 +08:00
"", " inv_q", " stat", " op3", " notify", " update", " op6", " op7",
DNS: fix a typo
2014-03-25 15:56:49 +08:00
" op8", " updateA", " updateD", " updateDA",
Initial revision
1999-10-08 07:47:09 +08:00
" updateM", " updateMA", " zoneInit", " zoneRef",
};
Eliminate some unused parameters. Use const more. Use EXTRACT_* macros more. Use TCHECK* more. Use tok2str() to replace some home-grown workalikes. smb: - Get rid of private types, use tcpdump-defined types - Rename fdata and fdata1 to smb_fdata and smb_fdata1 to avoid conflict with IRIX library function.
2001-09-18 05:57:50 +08:00
static const char *ns_resp[] = {
Initial revision
1999-10-08 07:47:09 +08:00
"", " FormErr", " ServFail", " NXDomain",
print dynamic update a little bit better
2001-02-20 14:22:57 +08:00
" NotImp", " Refused", " YXDomain", " YXRRSet",
" NXRRSet", " NotAuth", " NotZone", " Resp11",
Initial revision
1999-10-08 07:47:09 +08:00
" Resp12", " Resp13", " Resp14", " NoChange",
Extract extend DNS rcode from OPT record and print it.
2019-02-13 06:50:17 +08:00
" BadVers", "Resp17", " Resp18", " Resp19",
" Resp20", "Resp21", " Resp22", " BadCookie",
Initial revision
1999-10-08 07:47:09 +08:00
};
Extract extend DNS rcode from OPT record and print it.
2019-02-13 06:50:17 +08:00
static const char *
Squelch a compiler warning. Response codes are unsigned; make the argument to ns_rcode() unsigned.
2019-03-27 08:54:39 +08:00
ns_rcode(u_int rcode) {
Extract extend DNS rcode from OPT record and print it.
2019-02-13 06:50:17 +08:00
static char buf[sizeof(" Resp4095")];
if (rcode < sizeof(ns_resp)/sizeof(ns_resp[0])) {
return (ns_resp[rcode]);
}
snprintf(buf, sizeof(buf), " Resp%u", rcode & 0xfff);
return (buf);
}
Initial revision
1999-10-08 07:47:09 +08:00
/* skip over a domain name */
static const u_char *
NDOize BOOTP, DHCPv6, DNS, PIM and sFlow decoders Also add/remove tabs in a few involved functions to justify indentation.
2014-03-25 19:05:59 +08:00
ns_nskip(netdissect_options *ndo,
Remove all storage class specifier 'register' Let the compiler do the optimizations (or not) based on build options. Avoid 'value has been optimized out' messages in gdb using '-O0'.
2017-12-14 02:17:47 +08:00
const u_char *cp)
Initial revision
1999-10-08 07:47:09 +08:00
{
Remove all storage class specifier 'register' Let the compiler do the optimizations (or not) based on build options. Avoid 'value has been optimized out' messages in gdb using '-O0'.
2017-12-14 02:17:47 +08:00
u_char i;
Initial revision
1999-10-08 07:47:09 +08:00
Rename ND_TCHECK_/ND_TTEST_ macros Now all the macros have a name meaning a count in bytes. e.g.: ND_TCHECK_32BITS -> ND_TCHECK_4 ND_TTEST_32BITS -> ND_TTEST_4
2017-11-23 04:58:44 +08:00
if (!ND_TTEST_1(cp))
Audit DNS printer for buffer overflows. Use TTEST2() in tests, and make some additional tests (some of which might, in theory, be unnecessary, but...). Check for null pointers *before* checking whether there's enough data at the pointer in question.
2001-02-23 16:55:21 +08:00
return (NULL);
Use the new GET_ macros instead of the EXTRACT_ ones The exceptions are currently: Some EXTRACT_ in print-juniper.c, not used on packet buffer pointer. An EXTRACT_BE_U_3 in addrtoname.c, not always used on packet buffer pointer.
2018-06-16 23:23:21 +08:00
i = GET_U_1(cp);
More EXTRACT_8BITS() changes. Use ND_CHECK_nBITS() more as well.
2017-11-20 09:59:51 +08:00
cp++;
Audit DNS printer for buffer overflows. Use TTEST2() in tests, and make some additional tests (some of which might, in theory, be unnecessary, but...). Check for null pointers *before* checking whether there's enough data at the pointer in question.
2001-02-23 16:55:21 +08:00
while (i) {
Teach ns_nskip() that pointers can occur anywhere, not just as the first label. Add SRV record data section printing, in the form SRV target:port priority weight
2003-04-04 08:18:54 +08:00
if ((i & INDIR_MASK) == INDIR_MASK)
return (cp + 1);
support DNAME and bit string label. more pedantic snapend validation. {jinmei,itojun}@kame.net
2000-12-29 04:30:41 +08:00
if ((i & INDIR_MASK) == EDNS0_MASK) {
int bitlen, bytelen;
if ((i & ~INDIR_MASK) != EDNS0_ELT_BITLABEL)
return(NULL); /* unknown ELT */
Rename ND_TCHECK_/ND_TTEST_ macros Now all the macros have a name meaning a count in bytes. e.g.: ND_TCHECK_32BITS -> ND_TCHECK_4 ND_TTEST_32BITS -> ND_TTEST_4
2017-11-23 04:58:44 +08:00
if (!ND_TTEST_1(cp))
Audit DNS printer for buffer overflows. Use TTEST2() in tests, and make some additional tests (some of which might, in theory, be unnecessary, but...). Check for null pointers *before* checking whether there's enough data at the pointer in question.
2001-02-23 16:55:21 +08:00
return (NULL);
Use the new GET_ macros instead of the EXTRACT_ ones The exceptions are currently: Some EXTRACT_ in print-juniper.c, not used on packet buffer pointer. An EXTRACT_BE_U_3 in addrtoname.c, not always used on packet buffer pointer.
2018-06-16 23:23:21 +08:00
if ((bitlen = GET_U_1(cp)) == 0)
support DNAME and bit string label. more pedantic snapend validation. {jinmei,itojun}@kame.net
2000-12-29 04:30:41 +08:00
bitlen = 256;
More EXTRACT_8BITS() changes. Use ND_CHECK_nBITS() more as well.
2017-11-20 09:59:51 +08:00
cp++;
support DNAME and bit string label. more pedantic snapend validation. {jinmei,itojun}@kame.net
2000-12-29 04:30:41 +08:00
bytelen = (bitlen + 7) / 8;
cp += bytelen;
} else
cp += i;
Rename ND_TCHECK_/ND_TTEST_ macros Now all the macros have a name meaning a count in bytes. e.g.: ND_TCHECK_32BITS -> ND_TCHECK_4 ND_TTEST_32BITS -> ND_TTEST_4
2017-11-23 04:58:44 +08:00
if (!ND_TTEST_1(cp))
Audit DNS printer for buffer overflows. Use TTEST2() in tests, and make some additional tests (some of which might, in theory, be unnecessary, but...). Check for null pointers *before* checking whether there's enough data at the pointer in question.
2001-02-23 16:55:21 +08:00
return (NULL);
Use the new GET_ macros instead of the EXTRACT_ ones The exceptions are currently: Some EXTRACT_ in print-juniper.c, not used on packet buffer pointer. An EXTRACT_BE_U_3 in addrtoname.c, not always used on packet buffer pointer.
2018-06-16 23:23:21 +08:00
i = GET_U_1(cp);
More EXTRACT_8BITS() changes. Use ND_CHECK_nBITS() more as well.
2017-11-20 09:59:51 +08:00
cp++;
Initial revision
1999-10-08 07:47:09 +08:00
}
return (cp);
}
static const u_char *
NDOize BOOTP, DHCPv6, DNS, PIM and sFlow decoders Also add/remove tabs in a few involved functions to justify indentation.
2014-03-25 19:05:59 +08:00
blabel_print(netdissect_options *ndo,
const u_char *cp)
support DNAME and bit string label. more pedantic snapend validation. {jinmei,itojun}@kame.net
2000-12-29 04:30:41 +08:00
{
Clean up signed vs. unsigned.
2018-01-12 03:52:30 +08:00
u_int bitlen, slen, b;
support DNAME and bit string label. more pedantic snapend validation. {jinmei,itojun}@kame.net
2000-12-29 04:30:41 +08:00
const u_char *bitp, *lim;
Clean up signed vs. unsigned.
2018-01-12 03:52:30 +08:00
uint8_t tc;
support DNAME and bit string label. more pedantic snapend validation. {jinmei,itojun}@kame.net
2000-12-29 04:30:41 +08:00
Rename ND_TCHECK_/ND_TTEST_ macros Now all the macros have a name meaning a count in bytes. e.g.: ND_TCHECK_32BITS -> ND_TCHECK_4 ND_TTEST_32BITS -> ND_TTEST_4
2017-11-23 04:58:44 +08:00
if (!ND_TTEST_1(cp))
support DNAME and bit string label. more pedantic snapend validation. {jinmei,itojun}@kame.net
2000-12-29 04:30:41 +08:00
return(NULL);
Use the new GET_ macros instead of the EXTRACT_ ones The exceptions are currently: Some EXTRACT_ in print-juniper.c, not used on packet buffer pointer. An EXTRACT_BE_U_3 in addrtoname.c, not always used on packet buffer pointer.
2018-06-16 23:23:21 +08:00
if ((bitlen = GET_U_1(cp)) == 0)
support DNAME and bit string label. more pedantic snapend validation. {jinmei,itojun}@kame.net
2000-12-29 04:30:41 +08:00
bitlen = 256;
correct bit string label decoding. jinmei@kame.net
2000-12-30 23:47:58 +08:00
slen = (bitlen + 3) / 4;
Rewrite bitstring truncation check; it would incorrectly trigger on a query like IP 127.0.0.1.49859 > 127.0.0.1.53: 13041+ PTR? \[xdead000000000000000000000000beef/128].ip6.arpa. (44)
2004-03-24 03:03:03 +08:00
lim = cp + 1 + slen;
support DNAME and bit string label. more pedantic snapend validation. {jinmei,itojun}@kame.net
2000-12-29 04:30:41 +08:00
/* print the bit string as a hex string */
Update ND_PRINT() as a variadic macro
2018-01-07 18:47:30 +08:00
ND_PRINT("\\[x");
Rewrite bitstring truncation check; it would incorrectly trigger on a query like IP 127.0.0.1.49859 > 127.0.0.1.53: 13041+ PTR? \[xdead000000000000000000000000beef/128].ip6.arpa. (44)
2004-03-24 03:03:03 +08:00
for (bitp = cp + 1, b = bitlen; bitp < lim && b > 7; b -= 8, bitp++) {
Use more the ND_TCHECK_1() macro
2017-12-05 03:21:48 +08:00
ND_TCHECK_1(bitp);
Use the new GET_ macros instead of the EXTRACT_ ones The exceptions are currently: Some EXTRACT_ in print-juniper.c, not used on packet buffer pointer. An EXTRACT_BE_U_3 in addrtoname.c, not always used on packet buffer pointer.
2018-06-16 23:23:21 +08:00
ND_PRINT("%02x", GET_U_1(bitp));
Rewrite bitstring truncation check; it would incorrectly trigger on a query like IP 127.0.0.1.49859 > 127.0.0.1.53: 13041+ PTR? \[xdead000000000000000000000000beef/128].ip6.arpa. (44)
2004-03-24 03:03:03 +08:00
}
if (b > 4) {
Use more the ND_TCHECK_1() macro
2017-12-05 03:21:48 +08:00
ND_TCHECK_1(bitp);
Use the new GET_ macros instead of the EXTRACT_ ones The exceptions are currently: Some EXTRACT_ in print-juniper.c, not used on packet buffer pointer. An EXTRACT_BE_U_3 in addrtoname.c, not always used on packet buffer pointer.
2018-06-16 23:23:21 +08:00
tc = GET_U_1(bitp);
More EXTRACT_8BITS() changes. Use ND_CHECK_nBITS() more as well.
2017-11-20 09:59:51 +08:00
bitp++;
Update ND_PRINT() as a variadic macro
2018-01-07 18:47:30 +08:00
ND_PRINT("%02x", tc & (0xff << (8 - b)));
correct bit string label decoding. jinmei@kame.net
2000-12-30 23:47:58 +08:00
} else if (b > 0) {
Use more the ND_TCHECK_1() macro
2017-12-05 03:21:48 +08:00
ND_TCHECK_1(bitp);
Use the new GET_ macros instead of the EXTRACT_ ones The exceptions are currently: Some EXTRACT_ in print-juniper.c, not used on packet buffer pointer. An EXTRACT_BE_U_3 in addrtoname.c, not always used on packet buffer pointer.
2018-06-16 23:23:21 +08:00
tc = GET_U_1(bitp);
More EXTRACT_8BITS() changes. Use ND_CHECK_nBITS() more as well.
2017-11-20 09:59:51 +08:00
bitp++;
Update ND_PRINT() as a variadic macro
2018-01-07 18:47:30 +08:00
ND_PRINT("%1x", ((tc >> 4) & 0x0f) & (0x0f << (4 - b)));
correct bit string label decoding. jinmei@kame.net
2000-12-30 23:47:58 +08:00
}
Clean up signed vs. unsigned.
2018-01-12 03:52:30 +08:00
ND_PRINT("/%u]", bitlen);
Rewrite bitstring truncation check; it would incorrectly trigger on a query like IP 127.0.0.1.49859 > 127.0.0.1.53: 13041+ PTR? \[xdead000000000000000000000000beef/128].ip6.arpa. (44)
2004-03-24 03:03:03 +08:00
return lim;
trunc:
Clean up signed vs. unsigned.
2018-01-12 03:52:30 +08:00
ND_PRINT(".../%u]", bitlen);
Rewrite bitstring truncation check; it would incorrectly trigger on a query like IP 127.0.0.1.49859 > 127.0.0.1.53: 13041+ PTR? \[xdead000000000000000000000000beef/128].ip6.arpa. (44)
2004-03-24 03:03:03 +08:00
return NULL;
support DNAME and bit string label. more pedantic snapend validation. {jinmei,itojun}@kame.net
2000-12-29 04:30:41 +08:00
}
static int
NDOize BOOTP, DHCPv6, DNS, PIM and sFlow decoders Also add/remove tabs in a few involved functions to justify indentation.
2014-03-25 19:05:59 +08:00
labellen(netdissect_options *ndo,
const u_char *cp)
Initial revision
1999-10-08 07:47:09 +08:00
{
Remove all storage class specifier 'register' Let the compiler do the optimizations (or not) based on build options. Avoid 'value has been optimized out' messages in gdb using '-O0'.
2017-12-14 02:17:47 +08:00
u_int i;
support DNAME and bit string label. more pedantic snapend validation. {jinmei,itojun}@kame.net
2000-12-29 04:30:41 +08:00
Rename ND_TCHECK_/ND_TTEST_ macros Now all the macros have a name meaning a count in bytes. e.g.: ND_TCHECK_32BITS -> ND_TCHECK_4 ND_TTEST_32BITS -> ND_TTEST_4
2017-11-23 04:58:44 +08:00
if (!ND_TTEST_1(cp))
support DNAME and bit string label. more pedantic snapend validation. {jinmei,itojun}@kame.net
2000-12-29 04:30:41 +08:00
return(-1);
Use the new GET_ macros instead of the EXTRACT_ ones The exceptions are currently: Some EXTRACT_ in print-juniper.c, not used on packet buffer pointer. An EXTRACT_BE_U_3 in addrtoname.c, not always used on packet buffer pointer.
2018-06-16 23:23:21 +08:00
i = GET_U_1(cp);
support DNAME and bit string label. more pedantic snapend validation. {jinmei,itojun}@kame.net
2000-12-29 04:30:41 +08:00
if ((i & INDIR_MASK) == EDNS0_MASK) {
Clean up signed vs. unsigned.
2018-01-12 03:52:30 +08:00
u_int bitlen, elt;
If we get an ELT other than a bit label in labellen(), log it.
2005-04-21 04:59:30 +08:00
if ((elt = (i & ~INDIR_MASK)) != EDNS0_ELT_BITLABEL) {
Update ND_PRINT() as a variadic macro
2018-01-07 18:47:30 +08:00
ND_PRINT("<ELT %d>", elt);
support DNAME and bit string label. more pedantic snapend validation. {jinmei,itojun}@kame.net
2000-12-29 04:30:41 +08:00
return(-1);
If we get an ELT other than a bit label in labellen(), log it.
2005-04-21 04:59:30 +08:00
}
Rename ND_TCHECK_/ND_TTEST_ macros Now all the macros have a name meaning a count in bytes. e.g.: ND_TCHECK_32BITS -> ND_TCHECK_4 ND_TTEST_32BITS -> ND_TTEST_4
2017-11-23 04:58:44 +08:00
if (!ND_TTEST_1(cp + 1))
support DNAME and bit string label. more pedantic snapend validation. {jinmei,itojun}@kame.net
2000-12-29 04:30:41 +08:00
return(-1);
Use the new GET_ macros instead of the EXTRACT_ ones The exceptions are currently: Some EXTRACT_ in print-juniper.c, not used on packet buffer pointer. An EXTRACT_BE_U_3 in addrtoname.c, not always used on packet buffer pointer.
2018-06-16 23:23:21 +08:00
if ((bitlen = GET_U_1(cp + 1)) == 0)
support DNAME and bit string label. more pedantic snapend validation. {jinmei,itojun}@kame.net
2000-12-29 04:30:41 +08:00
bitlen = 256;
return(((bitlen + 7) / 8) + 1);
} else
return(i);
}
DNS: Rename a printer Rename ns_nprint() to fqdn_print(), with _print suffix like in most similar cases. Moreover: Move a misplaced comment.
2019-04-03 20:38:03 +08:00
/* print a <domain-name> */
add DNSSL (RFC6106) support The most notable difference between RFC5006 and RFC6106 is the addition of DNSSL RA option. This commit adds DNSSL handling code to make tcpdump fully RFC6106-aware. This code has been tested against RA packets generated by Quagga and radvd.
2012-04-13 20:32:40 +08:00
const u_char *
DNS: Rename a printer Rename ns_nprint() to fqdn_print(), with _print suffix like in most similar cases. Moreover: Move a misplaced comment.
2019-04-03 20:38:03 +08:00
fqdn_print(netdissect_options *ndo,
Remove all storage class specifier 'register' Let the compiler do the optimizations (or not) based on build options. Avoid 'value has been optimized out' messages in gdb using '-O0'.
2017-12-14 02:17:47 +08:00
const u_char *cp, const u_char *bp)
support DNAME and bit string label. more pedantic snapend validation. {jinmei,itojun}@kame.net
2000-12-29 04:30:41 +08:00
{
Remove all storage class specifier 'register' Let the compiler do the optimizations (or not) based on build options. Avoid 'value has been optimized out' messages in gdb using '-O0'.
2017-12-14 02:17:47 +08:00
u_int i, l;
const u_char *rp = NULL;
int compress = 0;
Clean up signed vs. unsigned.
2018-01-12 03:52:30 +08:00
u_int elt;
CVE-2017-12995/Check for DNS compression pointers that don't point backwards. This is what BIND 9.11.0-P2 does; it not only detects pointers that loop, as "point backwards" means "point before anything we've processed so far, including what we're processing right now", so the pointer can't point to itself (as that's what we're processing right now). This fixes an infinite loop discovered by Forcepoint's security researchers Otto Airamo & Antti Levomäki. Add a test using the capture file supplied by the reporter(s). Also, add some infinite-pointer-loop captures. More checks should be done. We might, for example, want to make sure the upper 2 bits of the label length/pointer byte are 00 or 11, and that if we encounter a pointer and jump backwards to what we think is a label the label ends before the beginning of the last label we processed, to make sure the pointer doesn't point backwards into the *middle* of a label, and also make sure the entire name is <= 255 bytes long.
2017-02-11 10:52:17 +08:00
u_int offset, max_offset;
Initial revision
1999-10-08 07:47:09 +08:00
NDOize BOOTP, DHCPv6, DNS, PIM and sFlow decoders Also add/remove tabs in a few involved functions to justify indentation.
2014-03-25 19:05:59 +08:00
if ((l = labellen(ndo, cp)) == (u_int)-1)
support DNAME and bit string label. more pedantic snapend validation. {jinmei,itojun}@kame.net
2000-12-29 04:30:41 +08:00
return(NULL);
Rename ND_TCHECK_/ND_TTEST_ macros Now all the macros have a name meaning a count in bytes. e.g.: ND_TCHECK_32BITS -> ND_TCHECK_4 ND_TTEST_32BITS -> ND_TTEST_4
2017-11-23 04:58:44 +08:00
if (!ND_TTEST_1(cp))
support DNAME and bit string label. more pedantic snapend validation. {jinmei,itojun}@kame.net
2000-12-29 04:30:41 +08:00
return(NULL);
CVE-2017-12995/Check for DNS compression pointers that don't point backwards. This is what BIND 9.11.0-P2 does; it not only detects pointers that loop, as "point backwards" means "point before anything we've processed so far, including what we're processing right now", so the pointer can't point to itself (as that's what we're processing right now). This fixes an infinite loop discovered by Forcepoint's security researchers Otto Airamo & Antti Levomäki. Add a test using the capture file supplied by the reporter(s). Also, add some infinite-pointer-loop captures. More checks should be done. We might, for example, want to make sure the upper 2 bits of the label length/pointer byte are 00 or 11, and that if we encounter a pointer and jump backwards to what we think is a label the label ends before the beginning of the last label we processed, to make sure the pointer doesn't point backwards into the *middle* of a label, and also make sure the entire name is <= 255 bytes long.
2017-02-11 10:52:17 +08:00
max_offset = (u_int)(cp - bp);
Use the new GET_ macros instead of the EXTRACT_ ones The exceptions are currently: Some EXTRACT_ in print-juniper.c, not used on packet buffer pointer. An EXTRACT_BE_U_3 in addrtoname.c, not always used on packet buffer pointer.
2018-06-16 23:23:21 +08:00
i = GET_U_1(cp);
More EXTRACT_8BITS() changes. Use ND_CHECK_nBITS() more as well.
2017-11-20 09:59:51 +08:00
cp++;
if ((i & INDIR_MASK) != INDIR_MASK) {
Initial revision
1999-10-08 07:47:09 +08:00
compress = 0;
support DNAME and bit string label. more pedantic snapend validation. {jinmei,itojun}@kame.net
2000-12-29 04:30:41 +08:00
rp = cp + l;
}
Initial revision
1999-10-08 07:47:09 +08:00
if (i != 0)
NDOize BOOTP, DHCPv6, DNS, PIM and sFlow decoders Also add/remove tabs in a few involved functions to justify indentation.
2014-03-25 19:05:59 +08:00
while (i && cp < ndo->ndo_snapend) {
Initial revision
1999-10-08 07:47:09 +08:00
if ((i & INDIR_MASK) == INDIR_MASK) {
support DNAME and bit string label. more pedantic snapend validation. {jinmei,itojun}@kame.net
2000-12-29 04:30:41 +08:00
if (!compress) {
rp = cp + 1;
compress = 1;
}
Rename ND_TCHECK_/ND_TTEST_ macros Now all the macros have a name meaning a count in bytes. e.g.: ND_TCHECK_32BITS -> ND_TCHECK_4 ND_TTEST_32BITS -> ND_TTEST_4
2017-11-23 04:58:44 +08:00
if (!ND_TTEST_1(cp))
support DNAME and bit string label. more pedantic snapend validation. {jinmei,itojun}@kame.net
2000-12-29 04:30:41 +08:00
return(NULL);
Use the new GET_ macros instead of the EXTRACT_ ones The exceptions are currently: Some EXTRACT_ in print-juniper.c, not used on packet buffer pointer. An EXTRACT_BE_U_3 in addrtoname.c, not always used on packet buffer pointer.
2018-06-16 23:23:21 +08:00
offset = (((i << 8) | GET_U_1(cp)) & 0x3fff);
CVE-2017-12995/Check for DNS compression pointers that don't point backwards. This is what BIND 9.11.0-P2 does; it not only detects pointers that loop, as "point backwards" means "point before anything we've processed so far, including what we're processing right now", so the pointer can't point to itself (as that's what we're processing right now). This fixes an infinite loop discovered by Forcepoint's security researchers Otto Airamo & Antti Levomäki. Add a test using the capture file supplied by the reporter(s). Also, add some infinite-pointer-loop captures. More checks should be done. We might, for example, want to make sure the upper 2 bits of the label length/pointer byte are 00 or 11, and that if we encounter a pointer and jump backwards to what we think is a label the label ends before the beginning of the last label we processed, to make sure the pointer doesn't point backwards into the *middle* of a label, and also make sure the entire name is <= 255 bytes long.
2017-02-11 10:52:17 +08:00
/*
* 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 (offset >= max_offset) {
Update ND_PRINT() as a variadic macro
2018-01-07 18:47:30 +08:00
ND_PRINT("<BAD PTR>");
CVE-2017-12995/Check for DNS compression pointers that don't point backwards. This is what BIND 9.11.0-P2 does; it not only detects pointers that loop, as "point backwards" means "point before anything we've processed so far, including what we're processing right now", so the pointer can't point to itself (as that's what we're processing right now). This fixes an infinite loop discovered by Forcepoint's security researchers Otto Airamo & Antti Levomäki. Add a test using the capture file supplied by the reporter(s). Also, add some infinite-pointer-loop captures. More checks should be done. We might, for example, want to make sure the upper 2 bits of the label length/pointer byte are 00 or 11, and that if we encounter a pointer and jump backwards to what we think is a label the label ends before the beginning of the last label we processed, to make sure the pointer doesn't point backwards into the *middle* of a label, and also make sure the entire name is <= 255 bytes long.
2017-02-11 10:52:17 +08:00
return(NULL);
}
max_offset = offset;
cp = bp + offset;
NDOize BOOTP, DHCPv6, DNS, PIM and sFlow decoders Also add/remove tabs in a few involved functions to justify indentation.
2014-03-25 19:05:59 +08:00
if ((l = labellen(ndo, cp)) == (u_int)-1)
support DNAME and bit string label. more pedantic snapend validation. {jinmei,itojun}@kame.net
2000-12-29 04:30:41 +08:00
return(NULL);
Rename ND_TCHECK_/ND_TTEST_ macros Now all the macros have a name meaning a count in bytes. e.g.: ND_TCHECK_32BITS -> ND_TCHECK_4 ND_TTEST_32BITS -> ND_TTEST_4
2017-11-23 04:58:44 +08:00
if (!ND_TTEST_1(cp))
Audit DNS printer for buffer overflows. Use TTEST2() in tests, and make some additional tests (some of which might, in theory, be unnecessary, but...). Check for null pointers *before* checking whether there's enough data at the pointer in question.
2001-02-23 16:55:21 +08:00
return(NULL);
Use the new GET_ macros instead of the EXTRACT_ ones The exceptions are currently: Some EXTRACT_ in print-juniper.c, not used on packet buffer pointer. An EXTRACT_BE_U_3 in addrtoname.c, not always used on packet buffer pointer.
2018-06-16 23:23:21 +08:00
i = GET_U_1(cp);
More EXTRACT_8BITS() changes. Use ND_CHECK_nBITS() more as well.
2017-11-20 09:59:51 +08:00
cp++;
Initial revision
1999-10-08 07:47:09 +08:00
continue;
}
support DNAME and bit string label. more pedantic snapend validation. {jinmei,itojun}@kame.net
2000-12-29 04:30:41 +08:00
if ((i & INDIR_MASK) == EDNS0_MASK) {
elt = (i & ~INDIR_MASK);
switch(elt) {
case EDNS0_ELT_BITLABEL:
NDOize BOOTP, DHCPv6, DNS, PIM and sFlow decoders Also add/remove tabs in a few involved functions to justify indentation.
2014-03-25 19:05:59 +08:00
if (blabel_print(ndo, cp) == NULL)
Audit DNS printer for buffer overflows. Use TTEST2() in tests, and make some additional tests (some of which might, in theory, be unnecessary, but...). Check for null pointers *before* checking whether there's enough data at the pointer in question.
2001-02-23 16:55:21 +08:00
return (NULL);
support DNAME and bit string label. more pedantic snapend validation. {jinmei,itojun}@kame.net
2000-12-29 04:30:41 +08:00
break;
default:
/* unknown ELT */
Clean up signed vs. unsigned.
2018-01-12 03:52:30 +08:00
ND_PRINT("<ELT %u>", elt);
support DNAME and bit string label. more pedantic snapend validation. {jinmei,itojun}@kame.net
2000-12-29 04:30:41 +08:00
return(NULL);
}
} else {
Rename the fn_printX() functions to nd_printX() The functions are: nd_print, nd_printztn, nd_printn and nd_printzp. Trying to make it clearer that they currently have to be used only on part of the packet buffer. Update some comments.
2018-04-30 18:52:10 +08:00
if (nd_printn(ndo, cp, l, ndo->ndo_snapend))
Audit DNS printer for buffer overflows. Use TTEST2() in tests, and make some additional tests (some of which might, in theory, be unnecessary, but...). Check for null pointers *before* checking whether there's enough data at the pointer in question.
2001-02-23 16:55:21 +08:00
return(NULL);
support DNAME and bit string label. more pedantic snapend validation. {jinmei,itojun}@kame.net
2000-12-29 04:30:41 +08:00
}
cp += l;
Update ND_PRINT() as a variadic macro
2018-01-07 18:47:30 +08:00
ND_PRINT(".");
NDOize BOOTP, DHCPv6, DNS, PIM and sFlow decoders Also add/remove tabs in a few involved functions to justify indentation.
2014-03-25 19:05:59 +08:00
if ((l = labellen(ndo, cp)) == (u_int)-1)
Audit DNS printer for buffer overflows. Use TTEST2() in tests, and make some additional tests (some of which might, in theory, be unnecessary, but...). Check for null pointers *before* checking whether there's enough data at the pointer in question.
2001-02-23 16:55:21 +08:00
return(NULL);
Rename ND_TCHECK_/ND_TTEST_ macros Now all the macros have a name meaning a count in bytes. e.g.: ND_TCHECK_32BITS -> ND_TCHECK_4 ND_TTEST_32BITS -> ND_TTEST_4
2017-11-23 04:58:44 +08:00
if (!ND_TTEST_1(cp))
support DNAME and bit string label. more pedantic snapend validation. {jinmei,itojun}@kame.net
2000-12-29 04:30:41 +08:00
return(NULL);
Use the new GET_ macros instead of the EXTRACT_ ones The exceptions are currently: Some EXTRACT_ in print-juniper.c, not used on packet buffer pointer. An EXTRACT_BE_U_3 in addrtoname.c, not always used on packet buffer pointer.
2018-06-16 23:23:21 +08:00
i = GET_U_1(cp);
More EXTRACT_8BITS() changes. Use ND_CHECK_nBITS() more as well.
2017-11-20 09:59:51 +08:00
cp++;
Initial revision
1999-10-08 07:47:09 +08:00
if (!compress)
support DNAME and bit string label. more pedantic snapend validation. {jinmei,itojun}@kame.net
2000-12-29 04:30:41 +08:00
rp += l + 1;
Initial revision
1999-10-08 07:47:09 +08:00
}
else
Update ND_PRINT() as a variadic macro
2018-01-07 18:47:30 +08:00
ND_PRINT(".");
Initial revision
1999-10-08 07:47:09 +08:00
return (rp);
}
/* print a <character-string> */
static const u_char *
NDOize BOOTP, DHCPv6, DNS, PIM and sFlow decoders Also add/remove tabs in a few involved functions to justify indentation.
2014-03-25 19:05:59 +08:00
ns_cprint(netdissect_options *ndo,
Remove all storage class specifier 'register' Let the compiler do the optimizations (or not) based on build options. Avoid 'value has been optimized out' messages in gdb using '-O0'.
2017-12-14 02:17:47 +08:00
const u_char *cp)
Initial revision
1999-10-08 07:47:09 +08:00
{
Remove all storage class specifier 'register' Let the compiler do the optimizations (or not) based on build options. Avoid 'value has been optimized out' messages in gdb using '-O0'.
2017-12-14 02:17:47 +08:00
u_int i;
Initial revision
1999-10-08 07:47:09 +08:00
Rename ND_TCHECK_/ND_TTEST_ macros Now all the macros have a name meaning a count in bytes. e.g.: ND_TCHECK_32BITS -> ND_TCHECK_4 ND_TTEST_32BITS -> ND_TTEST_4
2017-11-23 04:58:44 +08:00
if (!ND_TTEST_1(cp))
Audit DNS printer for buffer overflows. Use TTEST2() in tests, and make some additional tests (some of which might, in theory, be unnecessary, but...). Check for null pointers *before* checking whether there's enough data at the pointer in question.
2001-02-23 16:55:21 +08:00
return (NULL);
Use the new GET_ macros instead of the EXTRACT_ ones The exceptions are currently: Some EXTRACT_ in print-juniper.c, not used on packet buffer pointer. An EXTRACT_BE_U_3 in addrtoname.c, not always used on packet buffer pointer.
2018-06-16 23:23:21 +08:00
i = GET_U_1(cp);
More EXTRACT_8BITS() changes. Use ND_CHECK_nBITS() more as well.
2017-11-20 09:59:51 +08:00
cp++;
Rename the fn_printX() functions to nd_printX() The functions are: nd_print, nd_printztn, nd_printn and nd_printzp. Trying to make it clearer that they currently have to be used only on part of the packet buffer. Update some comments.
2018-04-30 18:52:10 +08:00
if (nd_printn(ndo, cp, i, ndo->ndo_snapend))
Audit DNS printer for buffer overflows. Use TTEST2() in tests, and make some additional tests (some of which might, in theory, be unnecessary, but...). Check for null pointers *before* checking whether there's enough data at the pointer in question.
2001-02-23 16:55:21 +08:00
return (NULL);
Initial revision
1999-10-08 07:47:09 +08:00
return (cp + i);
}
DNS: Address two clang warnings The warnings were: ./print-domain.c:258:18: warning: no previous extern declaration for non-static variable 'ns_type2str' [-Wmissing-variable-declarations] const struct tok ns_type2str[] = { ^ ./print-domain.c:323:18: warning: no previous extern declaration for non-static variable 'ns_class2str' [-Wmissing-variable-declarations] const struct tok ns_class2str[] = { ^
2017-12-31 03:12:07 +08:00
extern const struct tok ns_type2str[];
Insert references to type definition RFCs. Use EXTRACT_16BITS to get type, class, length instead of manual byte extraction. Print multiple <character-string>s if present in TXT records. Don't print arbitrary junk from the packet when parsing an [illegal] 0-length TXT record.
2003-04-04 11:49:25 +08:00
/* http://www.iana.org/assignments/dns-parameters */
justify declarations of struct tok arrays Make sure all of them are declared const and most of them -- static. Proper declaration of token arrays is a common review point for new code that is based on existing decoders. Thus fix the issue at its root.
2013-09-25 00:46:24 +08:00
const struct tok ns_type2str[] = {
Insert references to type definition RFCs. Use EXTRACT_16BITS to get type, class, length instead of manual byte extraction. Print multiple <character-string>s if present in TXT records. Don't print arbitrary junk from the packet when parsing an [illegal] 0-length TXT record.
2003-04-04 11:49:25 +08:00
{ 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 */
Initial revision
1999-10-08 07:47:09 +08:00
{ T_NSAP_PTR, "NSAP_PTR" },
Insert references to type definition RFCs. Use EXTRACT_16BITS to get type, class, length instead of manual byte extraction. Print multiple <character-string>s if present in TXT records. Don't print arbitrary junk from the packet when parsing an [illegal] 0-length TXT record.
2003-04-04 11:49:25 +08:00
{ 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 */
From Wesley Griffin <wgriffin@users.sourceforge.net>: update the list of DNS RR typecodes.
2006-04-07 16:47:34 +08:00
{ T_KX, "KX" }, /* RFC 2230 */
{ T_CERT, "CERT" }, /* RFC 2538 */
Insert references to type definition RFCs. Use EXTRACT_16BITS to get type, class, length instead of manual byte extraction. Print multiple <character-string>s if present in TXT records. Don't print arbitrary junk from the packet when parsing an [illegal] 0-length TXT record.
2003-04-04 11:49:25 +08:00
{ T_A6, "A6" }, /* RFC 2874 */
{ T_DNAME, "DNAME" }, /* RFC 2672 */
From Wesley Griffin <wgriffin@users.sourceforge.net>: update the list of DNS RR typecodes.
2006-04-07 16:47:34 +08:00
{ T_SINK, "SINK" },
Insert references to type definition RFCs. Use EXTRACT_16BITS to get type, class, length instead of manual byte extraction. Print multiple <character-string>s if present in TXT records. Don't print arbitrary junk from the packet when parsing an [illegal] 0-length TXT record.
2003-04-04 11:49:25 +08:00
{ T_OPT, "OPT" }, /* RFC 2671 */
From Wesley Griffin <wgriffin@users.sourceforge.net>: update the list of DNS RR typecodes.
2006-04-07 16:47:34 +08:00
{ 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 */
Initial revision
1999-10-08 07:47:09 +08:00
{ T_UINFO, "UINFO" },
{ T_UID, "UID" },
{ T_GID, "GID" },
{ T_UNSPEC, "UNSPEC" },
{ T_UNSPECA, "UNSPECA" },
Insert references to type definition RFCs. Use EXTRACT_16BITS to get type, class, length instead of manual byte extraction. Print multiple <character-string>s if present in TXT records. Don't print arbitrary junk from the packet when parsing an [illegal] 0-length TXT record.
2003-04-04 11:49:25 +08:00
{ 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 */
Initial revision
1999-10-08 07:47:09 +08:00
{ T_ANY, "ANY" },
{ 0, NULL }
};
DNS: Address two clang warnings The warnings were: ./print-domain.c:258:18: warning: no previous extern declaration for non-static variable 'ns_type2str' [-Wmissing-variable-declarations] const struct tok ns_type2str[] = { ^ ./print-domain.c:323:18: warning: no previous extern declaration for non-static variable 'ns_class2str' [-Wmissing-variable-declarations] const struct tok ns_class2str[] = { ^
2017-12-31 03:12:07 +08:00
extern const struct tok ns_class2str[];
justify declarations of struct tok arrays Make sure all of them are declared const and most of them -- static. Proper declaration of token arrays is a common review point for new code that is based on existing decoders. Thus fix the issue at its root.
2013-09-25 00:46:24 +08:00
const struct tok ns_class2str[] = {
Initial revision
1999-10-08 07:47:09 +08:00
{ C_IN, "IN" }, /* Not used */
remove extra space after type name
2001-01-28 15:56:21 +08:00
{ C_CHAOS, "CHAOS" },
Initial revision
1999-10-08 07:47:09 +08:00
{ C_HS, "HS" },
{ C_ANY, "ANY" },
{ 0, NULL }
};
/* print a query */
support DNAME and bit string label. more pedantic snapend validation. {jinmei,itojun}@kame.net
2000-12-29 04:30:41 +08:00
static const u_char *
NDOize BOOTP, DHCPv6, DNS, PIM and sFlow decoders Also add/remove tabs in a few involved functions to justify indentation.
2014-03-25 19:05:59 +08:00
ns_qprint(netdissect_options *ndo,
Remove all storage class specifier 'register' Let the compiler do the optimizations (or not) based on build options. Avoid 'value has been optimized out' messages in gdb using '-O0'.
2017-12-14 02:17:47 +08:00
const u_char *cp, const u_char *bp, int is_mdns)
Initial revision
1999-10-08 07:47:09 +08:00
{
Remove all storage class specifier 'register' Let the compiler do the optimizations (or not) based on build options. Avoid 'value has been optimized out' messages in gdb using '-O0'.
2017-12-14 02:17:47 +08:00
const u_char *np = cp;
u_int i, class;
Initial revision
1999-10-08 07:47:09 +08:00
NDOize BOOTP, DHCPv6, DNS, PIM and sFlow decoders Also add/remove tabs in a few involved functions to justify indentation.
2014-03-25 19:05:59 +08:00
cp = ns_nskip(ndo, cp);
Initial revision
1999-10-08 07:47:09 +08:00
Use more ND_TCHECK_n()/ND_TTEST_n() macros
2017-11-25 05:48:55 +08:00
if (cp == NULL || !ND_TTEST_4(cp))
support DNAME and bit string label. more pedantic snapend validation. {jinmei,itojun}@kame.net
2000-12-29 04:30:41 +08:00
return(NULL);
Initial revision
1999-10-08 07:47:09 +08:00
The topmost bit in the class field isn't a "cache flush" flag in mDNS queries. Display that bit correctly (as per Marc Krochmal's request). In mDNS, the topmost bit of the class field should be handled the same way regardless of the value of the lower 15 bits, and *vice versa* - they're independent fields.
2006-11-10 11:18:21 +08:00
/* print the qtype */
Use the new GET_ macros instead of the EXTRACT_ ones The exceptions are currently: Some EXTRACT_ in print-juniper.c, not used on packet buffer pointer. An EXTRACT_BE_U_3 in addrtoname.c, not always used on packet buffer pointer.
2018-06-16 23:23:21 +08:00
i = GET_BE_U_2(cp);
Insert references to type definition RFCs. Use EXTRACT_16BITS to get type, class, length instead of manual byte extraction. Print multiple <character-string>s if present in TXT records. Don't print arbitrary junk from the packet when parsing an [illegal] 0-length TXT record.
2003-04-04 11:49:25 +08:00
cp += 2;
Clean up signed vs. unsigned.
2018-01-12 03:52:30 +08:00
ND_PRINT(" %s", tok2str(ns_type2str, "Type%u", i));
The topmost bit in the class field isn't a "cache flush" flag in mDNS queries. Display that bit correctly (as per Marc Krochmal's request). In mDNS, the topmost bit of the class field should be handled the same way regardless of the value of the lower 15 bits, and *vice versa* - they're independent fields.
2006-11-10 11:18:21 +08:00
/* print the qclass (if it's not IN) */
Use the new GET_ macros instead of the EXTRACT_ ones The exceptions are currently: Some EXTRACT_ in print-juniper.c, not used on packet buffer pointer. An EXTRACT_BE_U_3 in addrtoname.c, not always used on packet buffer pointer.
2018-06-16 23:23:21 +08:00
i = GET_BE_U_2(cp);
Insert references to type definition RFCs. Use EXTRACT_16BITS to get type, class, length instead of manual byte extraction. Print multiple <character-string>s if present in TXT records. Don't print arbitrary junk from the packet when parsing an [illegal] 0-length TXT record.
2003-04-04 11:49:25 +08:00
cp += 2;
Only print (QU) and (QM) for mDNS queries. Make the code a little clearer about what's done for DNS vs. what's done for mDNS.
2007-02-14 03:19:00 +08:00
if (is_mdns)
The topmost bit in the class field isn't a "cache flush" flag in mDNS queries. Display that bit correctly (as per Marc Krochmal's request). In mDNS, the topmost bit of the class field should be handled the same way regardless of the value of the lower 15 bits, and *vice versa* - they're independent fields.
2006-11-10 11:18:21 +08:00
class = (i & ~C_QU);
Only print (QU) and (QM) for mDNS queries. Make the code a little clearer about what's done for DNS vs. what's done for mDNS.
2007-02-14 03:19:00 +08:00
else
The topmost bit in the class field isn't a "cache flush" flag in mDNS queries. Display that bit correctly (as per Marc Krochmal's request). In mDNS, the topmost bit of the class field should be handled the same way regardless of the value of the lower 15 bits, and *vice versa* - they're independent fields.
2006-11-10 11:18:21 +08:00
class = i;
if (class != C_IN)
Clean up signed vs. unsigned.
2018-01-12 03:52:30 +08:00
ND_PRINT(" %s", tok2str(ns_class2str, "(Class %u)", class));
Only print (QU) and (QM) for mDNS queries. Make the code a little clearer about what's done for DNS vs. what's done for mDNS.
2007-02-14 03:19:00 +08:00
if (is_mdns) {
Update ND_PRINT() as a variadic macro
2018-01-07 18:47:30 +08:00
ND_PRINT(i & C_QU ? " (QU)" : " (QM)");
Only print (QU) and (QM) for mDNS queries. Make the code a little clearer about what's done for DNS vs. what's done for mDNS.
2007-02-14 03:19:00 +08:00
}
Initial revision
1999-10-08 07:47:09 +08:00
Update ND_PRINT() as a variadic macro
2018-01-07 18:47:30 +08:00
ND_PRINT("? ");
DNS: Rename a printer Rename ns_nprint() to fqdn_print(), with _print suffix like in most similar cases. Moreover: Move a misplaced comment.
2019-04-03 20:38:03 +08:00
cp = fqdn_print(ndo, np, bp);
support DNAME and bit string label. more pedantic snapend validation. {jinmei,itojun}@kame.net
2000-12-29 04:30:41 +08:00
return(cp ? cp + 4 : NULL);
Initial revision
1999-10-08 07:47:09 +08:00
}
/* print a reply */
static const u_char *
NDOize BOOTP, DHCPv6, DNS, PIM and sFlow decoders Also add/remove tabs in a few involved functions to justify indentation.
2014-03-25 19:05:59 +08:00
ns_rprint(netdissect_options *ndo,
Remove all storage class specifier 'register' Let the compiler do the optimizations (or not) based on build options. Avoid 'value has been optimized out' messages in gdb using '-O0'.
2017-12-14 02:17:47 +08:00
const u_char *cp, const u_char *bp, int is_mdns)
Initial revision
1999-10-08 07:47:09 +08:00
{
Remove all storage class specifier 'register' Let the compiler do the optimizations (or not) based on build options. Avoid 'value has been optimized out' messages in gdb using '-O0'.
2017-12-14 02:17:47 +08:00
u_int i, class, opt_flags = 0;
u_short typ, len;
const u_char *rp;
Initial revision
1999-10-08 07:47:09 +08:00
NDOize BOOTP, DHCPv6, DNS, PIM and sFlow decoders Also add/remove tabs in a few involved functions to justify indentation.
2014-03-25 19:05:59 +08:00
if (ndo->ndo_vflag) {
Update ND_PRINT() as a variadic macro
2018-01-07 18:47:30 +08:00
ND_PRINT(" ");
DNS: Rename a printer Rename ns_nprint() to fqdn_print(), with _print suffix like in most similar cases. Moreover: Move a misplaced comment.
2019-04-03 20:38:03 +08:00
if ((cp = fqdn_print(ndo, cp, bp)) == NULL)
support DNAME and bit string label. more pedantic snapend validation. {jinmei,itojun}@kame.net
2000-12-29 04:30:41 +08:00
return NULL;
Initial revision
1999-10-08 07:47:09 +08:00
} else
NDOize BOOTP, DHCPv6, DNS, PIM and sFlow decoders Also add/remove tabs in a few involved functions to justify indentation.
2014-03-25 19:05:59 +08:00
cp = ns_nskip(ndo, cp);
Initial revision
1999-10-08 07:47:09 +08:00
Replace ND_TTEST2()/ND_TCHECK2() macros by macros using pointers (1/n) ND_TTEST2(var, l) -> ND_TTEST_LEN(p, l) ND_TCHECK2(var, l) -> ND_TCHECK_LEN(p, l)
2017-12-11 19:46:51 +08:00
if (cp == NULL || !ND_TTEST_LEN(cp, 10))
NDOize BOOTP, DHCPv6, DNS, PIM and sFlow decoders Also add/remove tabs in a few involved functions to justify indentation.
2014-03-25 19:05:59 +08:00
return (ndo->ndo_snapend);
Initial revision
1999-10-08 07:47:09 +08:00
The topmost bit in the class field isn't a "cache flush" flag in mDNS queries. Display that bit correctly (as per Marc Krochmal's request). In mDNS, the topmost bit of the class field should be handled the same way regardless of the value of the lower 15 bits, and *vice versa* - they're independent fields.
2006-11-10 11:18:21 +08:00
/* print the type/qtype */
Use the new GET_ macros instead of the EXTRACT_ ones The exceptions are currently: Some EXTRACT_ in print-juniper.c, not used on packet buffer pointer. An EXTRACT_BE_U_3 in addrtoname.c, not always used on packet buffer pointer.
2018-06-16 23:23:21 +08:00
typ = GET_BE_U_2(cp);
Insert references to type definition RFCs. Use EXTRACT_16BITS to get type, class, length instead of manual byte extraction. Print multiple <character-string>s if present in TXT records. Don't print arbitrary junk from the packet when parsing an [illegal] 0-length TXT record.
2003-04-04 11:49:25 +08:00
cp += 2;
The topmost bit in the class field isn't a "cache flush" flag in mDNS queries. Display that bit correctly (as per Marc Krochmal's request). In mDNS, the topmost bit of the class field should be handled the same way regardless of the value of the lower 15 bits, and *vice versa* - they're independent fields.
2006-11-10 11:18:21 +08:00
/* print the class (if it's not IN and the type isn't OPT) */
Use the new GET_ macros instead of the EXTRACT_ ones The exceptions are currently: Some EXTRACT_ in print-juniper.c, not used on packet buffer pointer. An EXTRACT_BE_U_3 in addrtoname.c, not always used on packet buffer pointer.
2018-06-16 23:23:21 +08:00
i = GET_BE_U_2(cp);
Insert references to type definition RFCs. Use EXTRACT_16BITS to get type, class, length instead of manual byte extraction. Print multiple <character-string>s if present in TXT records. Don't print arbitrary junk from the packet when parsing an [illegal] 0-length TXT record.
2003-04-04 11:49:25 +08:00
cp += 2;
Only print (QU) and (QM) for mDNS queries. Make the code a little clearer about what's done for DNS vs. what's done for mDNS.
2007-02-14 03:19:00 +08:00
if (is_mdns)
The topmost bit in the class field isn't a "cache flush" flag in mDNS queries. Display that bit correctly (as per Marc Krochmal's request). In mDNS, the topmost bit of the class field should be handled the same way regardless of the value of the lower 15 bits, and *vice versa* - they're independent fields.
2006-11-10 11:18:21 +08:00
class = (i & ~C_CACHE_FLUSH);
Only print (QU) and (QM) for mDNS queries. Make the code a little clearer about what's done for DNS vs. what's done for mDNS.
2007-02-14 03:19:00 +08:00
else
The topmost bit in the class field isn't a "cache flush" flag in mDNS queries. Display that bit correctly (as per Marc Krochmal's request). In mDNS, the topmost bit of the class field should be handled the same way regardless of the value of the lower 15 bits, and *vice versa* - they're independent fields.
2006-11-10 11:18:21 +08:00
class = i;
if (class != C_IN && typ != T_OPT)
Clean up signed vs. unsigned.
2018-01-12 03:52:30 +08:00
ND_PRINT(" %s", tok2str(ns_class2str, "(Class %u)", class));
Only print (QU) and (QM) for mDNS queries. Make the code a little clearer about what's done for DNS vs. what's done for mDNS.
2007-02-14 03:19:00 +08:00
if (is_mdns) {
if (i & C_CACHE_FLUSH)
Update ND_PRINT() as a variadic macro
2018-01-07 18:47:30 +08:00
ND_PRINT(" (Cache flush)");
Only print (QU) and (QM) for mDNS queries. Make the code a little clearer about what's done for DNS vs. what's done for mDNS.
2007-02-14 03:19:00 +08:00
}
Initial revision
1999-10-08 07:47:09 +08:00
From Greg Minshall: print the TTL for DNS entries with 3 or more "-v" flags; print the addresses in A, AAAA, and A6 entries numerically (the point of A, AAAA, and A6 entries being to give the address corresponding to a name). Better late than never - do at least a little de-spamification of addresses in the CREDITS file. (Greg's address was despammed in his sourceforge.net submission for this.) Move the late Jun-ichiro itojun Hagino to a "Past maintainers" section.
2007-12-09 09:40:32 +08:00
if (typ == T_OPT) {
/* get opt flags */
cp += 2;
Use the new GET_ macros instead of the EXTRACT_ ones The exceptions are currently: Some EXTRACT_ in print-juniper.c, not used on packet buffer pointer. An EXTRACT_BE_U_3 in addrtoname.c, not always used on packet buffer pointer.
2018-06-16 23:23:21 +08:00
opt_flags = GET_BE_U_2(cp);
From Greg Minshall: print the TTL for DNS entries with 3 or more "-v" flags; print the addresses in A, AAAA, and A6 entries numerically (the point of A, AAAA, and A6 entries being to give the address corresponding to a name). Better late than never - do at least a little de-spamification of addresses in the CREDITS file. (Greg's address was despammed in his sourceforge.net submission for this.) Move the late Jun-ichiro itojun Hagino to a "Past maintainers" section.
2007-12-09 09:40:32 +08:00
/* ignore rest of ttl field */
cp += 2;
NDOize BOOTP, DHCPv6, DNS, PIM and sFlow decoders Also add/remove tabs in a few involved functions to justify indentation.
2014-03-25 19:05:59 +08:00
} else if (ndo->ndo_vflag > 2) {
From Greg Minshall: print the TTL for DNS entries with 3 or more "-v" flags; print the addresses in A, AAAA, and A6 entries numerically (the point of A, AAAA, and A6 entries being to give the address corresponding to a name). Better late than never - do at least a little de-spamification of addresses in the CREDITS file. (Greg's address was despammed in his sourceforge.net submission for this.) Move the late Jun-ichiro itojun Hagino to a "Past maintainers" section.
2007-12-09 09:40:32 +08:00
/* print ttl */
Update ND_PRINT() as a variadic macro
2018-01-07 18:47:30 +08:00
ND_PRINT(" [");
Use the new GET_ macros instead of the EXTRACT_ ones The exceptions are currently: Some EXTRACT_ in print-juniper.c, not used on packet buffer pointer. An EXTRACT_BE_U_3 in addrtoname.c, not always used on packet buffer pointer.
2018-06-16 23:23:21 +08:00
unsigned_relts_print(ndo, GET_BE_U_4(cp));
Update ND_PRINT() as a variadic macro
2018-01-07 18:47:30 +08:00
ND_PRINT("]");
From Greg Minshall: print the TTL for DNS entries with 3 or more "-v" flags; print the addresses in A, AAAA, and A6 entries numerically (the point of A, AAAA, and A6 entries being to give the address corresponding to a name). Better late than never - do at least a little de-spamification of addresses in the CREDITS file. (Greg's address was despammed in his sourceforge.net submission for this.) Move the late Jun-ichiro itojun Hagino to a "Past maintainers" section.
2007-12-09 09:40:32 +08:00
cp += 4;
} else {
/* ignore ttl */
cp += 4;
}
Initial revision
1999-10-08 07:47:09 +08:00
Use the new GET_ macros instead of the EXTRACT_ ones The exceptions are currently: Some EXTRACT_ in print-juniper.c, not used on packet buffer pointer. An EXTRACT_BE_U_3 in addrtoname.c, not always used on packet buffer pointer.
2018-06-16 23:23:21 +08:00
len = GET_BE_U_2(cp);
Insert references to type definition RFCs. Use EXTRACT_16BITS to get type, class, length instead of manual byte extraction. Print multiple <character-string>s if present in TXT records. Don't print arbitrary junk from the packet when parsing an [illegal] 0-length TXT record.
2003-04-04 11:49:25 +08:00
cp += 2;
Initial revision
1999-10-08 07:47:09 +08:00
rp = cp + len;
Clean up signed vs. unsigned.
2018-01-12 03:52:30 +08:00
ND_PRINT(" %s", tok2str(ns_type2str, "Type%u", typ));
NDOize BOOTP, DHCPv6, DNS, PIM and sFlow decoders Also add/remove tabs in a few involved functions to justify indentation.
2014-03-25 19:05:59 +08:00
if (rp > ndo->ndo_snapend)
support DNAME and bit string label. more pedantic snapend validation. {jinmei,itojun}@kame.net
2000-12-29 04:30:41 +08:00
return(NULL);
Initial revision
1999-10-08 07:47:09 +08:00
support DNAME and bit string label. more pedantic snapend validation. {jinmei,itojun}@kame.net
2000-12-29 04:30:41 +08:00
switch (typ) {
Initial revision
1999-10-08 07:47:09 +08:00
case T_A:
Use nd_ipv6 rather than struct in6_addr in packet-layout structures. Also, use it, and nd_ipv4, in sizeof() operations.
2018-01-31 09:29:33 +08:00
if (!ND_TTEST_LEN(cp, sizeof(nd_ipv4)))
support DNAME and bit string label. more pedantic snapend validation. {jinmei,itojun}@kame.net
2000-12-29 04:30:41 +08:00
return(NULL);
Use the new GET_ macros instead of the EXTRACT_ ones The exceptions are currently: Some EXTRACT_ in print-juniper.c, not used on packet buffer pointer. An EXTRACT_BE_U_3 in addrtoname.c, not always used on packet buffer pointer.
2018-06-16 23:23:21 +08:00
ND_PRINT(" %s", intoa(GET_IPV4_TO_NETWORK_ORDER(cp)));
Initial revision
1999-10-08 07:47:09 +08:00
break;
case T_NS:
case T_CNAME:
case T_PTR:
Bring in KAME IPv6 tcpdump. replaces esp/ah/isakmp decoder. Hope I did not break anything. Portability on IPv4-only node needs checking, I'll do this very soon. (sorry for rather jumbo commit) XXx what is _FAVOR_BSD?
1999-10-30 13:11:06 +08:00
#ifdef T_DNAME
support DNAME and bit string label. more pedantic snapend validation. {jinmei,itojun}@kame.net
2000-12-29 04:30:41 +08:00
case T_DNAME:
Bring in KAME IPv6 tcpdump. replaces esp/ah/isakmp decoder. Hope I did not break anything. Portability on IPv4-only node needs checking, I'll do this very soon. (sorry for rather jumbo commit) XXx what is _FAVOR_BSD?
1999-10-30 13:11:06 +08:00
#endif
Update ND_PRINT() as a variadic macro
2018-01-07 18:47:30 +08:00
ND_PRINT(" ");
DNS: Rename a printer Rename ns_nprint() to fqdn_print(), with _print suffix like in most similar cases. Moreover: Move a misplaced comment.
2019-04-03 20:38:03 +08:00
if (fqdn_print(ndo, cp, bp) == NULL)
support DNAME and bit string label. more pedantic snapend validation. {jinmei,itojun}@kame.net
2000-12-29 04:30:41 +08:00
return(NULL);
Initial revision
1999-10-08 07:47:09 +08:00
break;
support DNAME and bit string label. more pedantic snapend validation. {jinmei,itojun}@kame.net
2000-12-29 04:30:41 +08:00
case T_SOA:
NDOize BOOTP, DHCPv6, DNS, PIM and sFlow decoders Also add/remove tabs in a few involved functions to justify indentation.
2014-03-25 19:05:59 +08:00
if (!ndo->ndo_vflag)
support DNAME and bit string label. more pedantic snapend validation. {jinmei,itojun}@kame.net
2000-12-29 04:30:41 +08:00
break;
Update ND_PRINT() as a variadic macro
2018-01-07 18:47:30 +08:00
ND_PRINT(" ");
DNS: Rename a printer Rename ns_nprint() to fqdn_print(), with _print suffix like in most similar cases. Moreover: Move a misplaced comment.
2019-04-03 20:38:03 +08:00
if ((cp = fqdn_print(ndo, cp, bp)) == NULL)
support DNAME and bit string label. more pedantic snapend validation. {jinmei,itojun}@kame.net
2000-12-29 04:30:41 +08:00
return(NULL);
Update ND_PRINT() as a variadic macro
2018-01-07 18:47:30 +08:00
ND_PRINT(" ");
DNS: Rename a printer Rename ns_nprint() to fqdn_print(), with _print suffix like in most similar cases. Moreover: Move a misplaced comment.
2019-04-03 20:38:03 +08:00
if ((cp = fqdn_print(ndo, cp, bp)) == NULL)
support DNAME and bit string label. more pedantic snapend validation. {jinmei,itojun}@kame.net
2000-12-29 04:30:41 +08:00
return(NULL);
Replace ND_TTEST2()/ND_TCHECK2() macros by macros using pointers (1/n) ND_TTEST2(var, l) -> ND_TTEST_LEN(p, l) ND_TCHECK2(var, l) -> ND_TCHECK_LEN(p, l)
2017-12-11 19:46:51 +08:00
if (!ND_TTEST_LEN(cp, 5 * 4))
support DNAME and bit string label. more pedantic snapend validation. {jinmei,itojun}@kame.net
2000-12-29 04:30:41 +08:00
return(NULL);
Use the new GET_ macros instead of the EXTRACT_ ones The exceptions are currently: Some EXTRACT_ in print-juniper.c, not used on packet buffer pointer. An EXTRACT_BE_U_3 in addrtoname.c, not always used on packet buffer pointer.
2018-06-16 23:23:21 +08:00
ND_PRINT(" %u", GET_BE_U_4(cp));
support DNAME and bit string label. more pedantic snapend validation. {jinmei,itojun}@kame.net
2000-12-29 04:30:41 +08:00
cp += 4;
Use the new GET_ macros instead of the EXTRACT_ ones The exceptions are currently: Some EXTRACT_ in print-juniper.c, not used on packet buffer pointer. An EXTRACT_BE_U_3 in addrtoname.c, not always used on packet buffer pointer.
2018-06-16 23:23:21 +08:00
ND_PRINT(" %u", GET_BE_U_4(cp));
support DNAME and bit string label. more pedantic snapend validation. {jinmei,itojun}@kame.net
2000-12-29 04:30:41 +08:00
cp += 4;
Use the new GET_ macros instead of the EXTRACT_ ones The exceptions are currently: Some EXTRACT_ in print-juniper.c, not used on packet buffer pointer. An EXTRACT_BE_U_3 in addrtoname.c, not always used on packet buffer pointer.
2018-06-16 23:23:21 +08:00
ND_PRINT(" %u", GET_BE_U_4(cp));
support DNAME and bit string label. more pedantic snapend validation. {jinmei,itojun}@kame.net
2000-12-29 04:30:41 +08:00
cp += 4;
Use the new GET_ macros instead of the EXTRACT_ ones The exceptions are currently: Some EXTRACT_ in print-juniper.c, not used on packet buffer pointer. An EXTRACT_BE_U_3 in addrtoname.c, not always used on packet buffer pointer.
2018-06-16 23:23:21 +08:00
ND_PRINT(" %u", GET_BE_U_4(cp));
support DNAME and bit string label. more pedantic snapend validation. {jinmei,itojun}@kame.net
2000-12-29 04:30:41 +08:00
cp += 4;
Use the new GET_ macros instead of the EXTRACT_ ones The exceptions are currently: Some EXTRACT_ in print-juniper.c, not used on packet buffer pointer. An EXTRACT_BE_U_3 in addrtoname.c, not always used on packet buffer pointer.
2018-06-16 23:23:21 +08:00
ND_PRINT(" %u", GET_BE_U_4(cp));
support DNAME and bit string label. more pedantic snapend validation. {jinmei,itojun}@kame.net
2000-12-29 04:30:41 +08:00
cp += 4;
break;
Initial revision
1999-10-08 07:47:09 +08:00
case T_MX:
Update ND_PRINT() as a variadic macro
2018-01-07 18:47:30 +08:00
ND_PRINT(" ");
Use more ND_TCHECK_n()/ND_TTEST_n() macros
2017-11-25 05:48:55 +08:00
if (!ND_TTEST_2(cp))
support DNAME and bit string label. more pedantic snapend validation. {jinmei,itojun}@kame.net
2000-12-29 04:30:41 +08:00
return(NULL);
DNS: Rename a printer Rename ns_nprint() to fqdn_print(), with _print suffix like in most similar cases. Moreover: Move a misplaced comment.
2019-04-03 20:38:03 +08:00
if (fqdn_print(ndo, cp + 2, bp) == NULL)
support DNAME and bit string label. more pedantic snapend validation. {jinmei,itojun}@kame.net
2000-12-29 04:30:41 +08:00
return(NULL);
Use the new GET_ macros instead of the EXTRACT_ ones The exceptions are currently: Some EXTRACT_ in print-juniper.c, not used on packet buffer pointer. An EXTRACT_BE_U_3 in addrtoname.c, not always used on packet buffer pointer.
2018-06-16 23:23:21 +08:00
ND_PRINT(" %u", GET_BE_U_2(cp));
Initial revision
1999-10-08 07:47:09 +08:00
break;
case T_TXT:
Insert references to type definition RFCs. Use EXTRACT_16BITS to get type, class, length instead of manual byte extraction. Print multiple <character-string>s if present in TXT records. Don't print arbitrary junk from the packet when parsing an [illegal] 0-length TXT record.
2003-04-04 11:49:25 +08:00
while (cp < rp) {
Update ND_PRINT() as a variadic macro
2018-01-07 18:47:30 +08:00
ND_PRINT(" \"");
NDOize BOOTP, DHCPv6, DNS, PIM and sFlow decoders Also add/remove tabs in a few involved functions to justify indentation.
2014-03-25 19:05:59 +08:00
cp = ns_cprint(ndo, cp);
Insert references to type definition RFCs. Use EXTRACT_16BITS to get type, class, length instead of manual byte extraction. Print multiple <character-string>s if present in TXT records. Don't print arbitrary junk from the packet when parsing an [illegal] 0-length TXT record.
2003-04-04 11:49:25 +08:00
if (cp == NULL)
return(NULL);
Update ND_PRINT() as a variadic macro
2018-01-07 18:47:30 +08:00
ND_PRINT("\"");
Insert references to type definition RFCs. Use EXTRACT_16BITS to get type, class, length instead of manual byte extraction. Print multiple <character-string>s if present in TXT records. Don't print arbitrary junk from the packet when parsing an [illegal] 0-length TXT record.
2003-04-04 11:49:25 +08:00
}
Initial revision
1999-10-08 07:47:09 +08:00
break;
Teach ns_nskip() that pointers can occur anywhere, not just as the first label. Add SRV record data section printing, in the form SRV target:port priority weight
2003-04-04 08:18:54 +08:00
case T_SRV:
Update ND_PRINT() as a variadic macro
2018-01-07 18:47:30 +08:00
ND_PRINT(" ");
Use more ND_TCHECK_n()/ND_TTEST_n() macros
2017-11-25 05:48:55 +08:00
if (!ND_TTEST_6(cp))
Teach ns_nskip() that pointers can occur anywhere, not just as the first label. Add SRV record data section printing, in the form SRV target:port priority weight
2003-04-04 08:18:54 +08:00
return(NULL);
DNS: Rename a printer Rename ns_nprint() to fqdn_print(), with _print suffix like in most similar cases. Moreover: Move a misplaced comment.
2019-04-03 20:38:03 +08:00
if (fqdn_print(ndo, cp + 6, bp) == NULL)
Teach ns_nskip() that pointers can occur anywhere, not just as the first label. Add SRV record data section printing, in the form SRV target:port priority weight
2003-04-04 08:18:54 +08:00
return(NULL);
Use the new GET_ macros instead of the EXTRACT_ ones The exceptions are currently: Some EXTRACT_ in print-juniper.c, not used on packet buffer pointer. An EXTRACT_BE_U_3 in addrtoname.c, not always used on packet buffer pointer.
2018-06-16 23:23:21 +08:00
ND_PRINT(":%u %u %u", GET_BE_U_2(cp + 4),
GET_BE_U_2(cp), GET_BE_U_2(cp + 2));
Teach ns_nskip() that pointers can occur anywhere, not just as the first label. Add SRV record data section printing, in the form SRV target:port priority weight
2003-04-04 08:18:54 +08:00
break;
Bring in KAME IPv6 tcpdump. replaces esp/ah/isakmp decoder. Hope I did not break anything. Portability on IPv4-only node needs checking, I'll do this very soon. (sorry for rather jumbo commit) XXx what is _FAVOR_BSD?
1999-10-30 13:11:06 +08:00
case T_AAAA:
From Greg Minshall: print the TTL for DNS entries with 3 or more "-v" flags; print the addresses in A, AAAA, and A6 entries numerically (the point of A, AAAA, and A6 entries being to give the address corresponding to a name). Better late than never - do at least a little de-spamification of addresses in the CREDITS file. (Greg's address was despammed in his sourceforge.net submission for this.) Move the late Jun-ichiro itojun Hagino to a "Past maintainers" section.
2007-12-09 09:40:32 +08:00
{
char ntop_buf[INET6_ADDRSTRLEN];
Use nd_ipv6 rather than struct in6_addr in packet-layout structures. Also, use it, and nd_ipv4, in sizeof() operations.
2018-01-31 09:29:33 +08:00
if (!ND_TTEST_LEN(cp, sizeof(nd_ipv6)))
support DNAME and bit string label. more pedantic snapend validation. {jinmei,itojun}@kame.net
2000-12-29 04:30:41 +08:00
return(NULL);
Update ND_PRINT() as a variadic macro
2018-01-07 18:47:30 +08:00
ND_PRINT(" %s",
addrtostr6(cp, ntop_buf, sizeof(ntop_buf)));
From Greg Minshall: print the TTL for DNS entries with 3 or more "-v" flags; print the addresses in A, AAAA, and A6 entries numerically (the point of A, AAAA, and A6 entries being to give the address corresponding to a name). Better late than never - do at least a little de-spamification of addresses in the CREDITS file. (Greg's address was despammed in his sourceforge.net submission for this.) Move the late Jun-ichiro itojun Hagino to a "Past maintainers" section.
2007-12-09 09:40:32 +08:00
Bring in KAME IPv6 tcpdump. replaces esp/ah/isakmp decoder. Hope I did not break anything. Portability on IPv4-only node needs checking, I'll do this very soon. (sorry for rather jumbo commit) XXx what is _FAVOR_BSD?
1999-10-30 13:11:06 +08:00
break;
From Greg Minshall: print the TTL for DNS entries with 3 or more "-v" flags; print the addresses in A, AAAA, and A6 entries numerically (the point of A, AAAA, and A6 entries being to give the address corresponding to a name). Better late than never - do at least a little de-spamification of addresses in the CREDITS file. (Greg's address was despammed in his sourceforge.net submission for this.) Move the late Jun-ichiro itojun Hagino to a "Past maintainers" section.
2007-12-09 09:40:32 +08:00
}
Bring in KAME IPv6 tcpdump. replaces esp/ah/isakmp decoder. Hope I did not break anything. Portability on IPv4-only node needs checking, I'll do this very soon. (sorry for rather jumbo commit) XXx what is _FAVOR_BSD?
1999-10-30 13:11:06 +08:00
support DNAME and bit string label. more pedantic snapend validation. {jinmei,itojun}@kame.net
2000-12-29 04:30:41 +08:00
case T_A6:
Bring in KAME IPv6 tcpdump. replaces esp/ah/isakmp decoder. Hope I did not break anything. Portability on IPv4-only node needs checking, I'll do this very soon. (sorry for rather jumbo commit) XXx what is _FAVOR_BSD?
1999-10-30 13:11:06 +08:00
{
struct in6_addr a;
support DNAME and bit string label. more pedantic snapend validation. {jinmei,itojun}@kame.net
2000-12-29 04:30:41 +08:00
int pbit, pbyte;
From Greg Minshall: print the TTL for DNS entries with 3 or more "-v" flags; print the addresses in A, AAAA, and A6 entries numerically (the point of A, AAAA, and A6 entries being to give the address corresponding to a name). Better late than never - do at least a little de-spamification of addresses in the CREDITS file. (Greg's address was despammed in his sourceforge.net submission for this.) Move the late Jun-ichiro itojun Hagino to a "Past maintainers" section.
2007-12-09 09:40:32 +08:00
char ntop_buf[INET6_ADDRSTRLEN];
support DNAME and bit string label. more pedantic snapend validation. {jinmei,itojun}@kame.net
2000-12-29 04:30:41 +08:00
Rename ND_TCHECK_/ND_TTEST_ macros Now all the macros have a name meaning a count in bytes. e.g.: ND_TCHECK_32BITS -> ND_TCHECK_4 ND_TTEST_32BITS -> ND_TTEST_4
2017-11-23 04:58:44 +08:00
if (!ND_TTEST_1(cp))
Audit DNS printer for buffer overflows. Use TTEST2() in tests, and make some additional tests (some of which might, in theory, be unnecessary, but...). Check for null pointers *before* checking whether there's enough data at the pointer in question.
2001-02-23 16:55:21 +08:00
return(NULL);
Use the new GET_ macros instead of the EXTRACT_ ones The exceptions are currently: Some EXTRACT_ in print-juniper.c, not used on packet buffer pointer. An EXTRACT_BE_U_3 in addrtoname.c, not always used on packet buffer pointer.
2018-06-16 23:23:21 +08:00
pbit = GET_U_1(cp);
support DNAME and bit string label. more pedantic snapend validation. {jinmei,itojun}@kame.net
2000-12-29 04:30:41 +08:00
pbyte = (pbit & ~7) / 8;
if (pbit > 128) {
Update ND_PRINT() as a variadic macro
2018-01-07 18:47:30 +08:00
ND_PRINT(" %u(bad plen)", pbit);
support DNAME and bit string label. more pedantic snapend validation. {jinmei,itojun}@kame.net
2000-12-29 04:30:41 +08:00
break;
} else if (pbit < 128) {
Replace ND_TTEST2()/ND_TCHECK2() macros by macros using pointers (1/n) ND_TTEST2(var, l) -> ND_TTEST_LEN(p, l) ND_TCHECK2(var, l) -> ND_TCHECK_LEN(p, l)
2017-12-11 19:46:51 +08:00
if (!ND_TTEST_LEN(cp + 1, sizeof(a) - pbyte))
Audit DNS printer for buffer overflows. Use TTEST2() in tests, and make some additional tests (some of which might, in theory, be unnecessary, but...). Check for null pointers *before* checking whether there's enough data at the pointer in question.
2001-02-23 16:55:21 +08:00
return(NULL);
support DNAME and bit string label. more pedantic snapend validation. {jinmei,itojun}@kame.net
2000-12-29 04:30:41 +08:00
memset(&a, 0, sizeof(a));
memcpy(&a.s6_addr[pbyte], cp + 1, sizeof(a) - pbyte);
Update ND_PRINT() as a variadic macro
2018-01-07 18:47:30 +08:00
ND_PRINT(" %u %s", pbit,
addrtostr6(&a, ntop_buf, sizeof(ntop_buf)));
support DNAME and bit string label. more pedantic snapend validation. {jinmei,itojun}@kame.net
2000-12-29 04:30:41 +08:00
}
spacing
2000-12-30 17:07:40 +08:00
if (pbit > 0) {
Update ND_PRINT() as a variadic macro
2018-01-07 18:47:30 +08:00
ND_PRINT(" ");
DNS: Rename a printer Rename ns_nprint() to fqdn_print(), with _print suffix like in most similar cases. Moreover: Move a misplaced comment.
2019-04-03 20:38:03 +08:00
if (fqdn_print(ndo, cp + 1 + sizeof(a) - pbyte, bp) == NULL)
support DNAME and bit string label. more pedantic snapend validation. {jinmei,itojun}@kame.net
2000-12-29 04:30:41 +08:00
return(NULL);
spacing
2000-12-30 17:07:40 +08:00
}
Bring in KAME IPv6 tcpdump. replaces esp/ah/isakmp decoder. Hope I did not break anything. Portability on IPv4-only node needs checking, I'll do this very soon. (sorry for rather jumbo commit) XXx what is _FAVOR_BSD?
1999-10-30 13:11:06 +08:00
break;
}
parse EDNS0.
2000-12-30 17:06:21 +08:00
case T_OPT:
Update ND_PRINT() as a variadic macro
2018-01-07 18:47:30 +08:00
ND_PRINT(" UDPsize=%u", class);
From Wesley Griffin <wgriffin@users.sourceforge.net>: print out the DNSSEC OK bit (RFC3225) which is encoded in the TTL field of the OPT pseudo RR.
2006-04-07 16:58:29 +08:00
if (opt_flags & 0x8000)
Update ND_PRINT() as a variadic macro
2018-01-07 18:47:30 +08:00
ND_PRINT(" DO");
parse EDNS0.
2000-12-30 17:06:21 +08:00
break;
Initial revision
1999-10-08 07:47:09 +08:00
case T_UNSPECA: /* One long string */
Replace ND_TTEST2()/ND_TCHECK2() macros by macros using pointers (1/n) ND_TTEST2(var, l) -> ND_TTEST_LEN(p, l) ND_TCHECK2(var, l) -> ND_TCHECK_LEN(p, l)
2017-12-11 19:46:51 +08:00
if (!ND_TTEST_LEN(cp, len))
Audit DNS printer for buffer overflows. Use TTEST2() in tests, and make some additional tests (some of which might, in theory, be unnecessary, but...). Check for null pointers *before* checking whether there's enough data at the pointer in question.
2001-02-23 16:55:21 +08:00
return(NULL);
Rename the fn_printX() functions to nd_printX() The functions are: nd_print, nd_printztn, nd_printn and nd_printzp. Trying to make it clearer that they currently have to be used only on part of the packet buffer. Update some comments.
2018-04-30 18:52:10 +08:00
if (nd_printn(ndo, cp, len, ndo->ndo_snapend))
support DNAME and bit string label. more pedantic snapend validation. {jinmei,itojun}@kame.net
2000-12-29 04:30:41 +08:00
return(NULL);
Initial revision
1999-10-08 07:47:09 +08:00
break;
slightly better TSIG decoding.
2001-02-20 15:22:17 +08:00
case T_TSIG:
{
NDOize BOOTP, DHCPv6, DNS, PIM and sFlow decoders Also add/remove tabs in a few involved functions to justify indentation.
2014-03-25 19:05:59 +08:00
if (cp + len > ndo->ndo_snapend)
slightly better TSIG decoding.
2001-02-20 15:22:17 +08:00
return(NULL);
NDOize BOOTP, DHCPv6, DNS, PIM and sFlow decoders Also add/remove tabs in a few involved functions to justify indentation.
2014-03-25 19:05:59 +08:00
if (!ndo->ndo_vflag)
slightly better TSIG decoding.
2001-02-20 15:22:17 +08:00
break;
Update ND_PRINT() as a variadic macro
2018-01-07 18:47:30 +08:00
ND_PRINT(" ");
DNS: Rename a printer Rename ns_nprint() to fqdn_print(), with _print suffix like in most similar cases. Moreover: Move a misplaced comment.
2019-04-03 20:38:03 +08:00
if ((cp = fqdn_print(ndo, cp, bp)) == NULL)
slightly better TSIG decoding.
2001-02-20 15:22:17 +08:00
return(NULL);
cp += 6;
Rename ND_TCHECK_/ND_TTEST_ macros Now all the macros have a name meaning a count in bytes. e.g.: ND_TCHECK_32BITS -> ND_TCHECK_4 ND_TTEST_32BITS -> ND_TTEST_4
2017-11-23 04:58:44 +08:00
if (!ND_TTEST_2(cp))
Audit DNS printer for buffer overflows. Use TTEST2() in tests, and make some additional tests (some of which might, in theory, be unnecessary, but...). Check for null pointers *before* checking whether there's enough data at the pointer in question.
2001-02-23 16:55:21 +08:00
return(NULL);
Use the new GET_ macros instead of the EXTRACT_ ones The exceptions are currently: Some EXTRACT_ in print-juniper.c, not used on packet buffer pointer. An EXTRACT_BE_U_3 in addrtoname.c, not always used on packet buffer pointer.
2018-06-16 23:23:21 +08:00
ND_PRINT(" fudge=%u", GET_BE_U_2(cp));
slightly better TSIG decoding.
2001-02-20 15:22:17 +08:00
cp += 2;
Rename ND_TCHECK_/ND_TTEST_ macros Now all the macros have a name meaning a count in bytes. e.g.: ND_TCHECK_32BITS -> ND_TCHECK_4 ND_TTEST_32BITS -> ND_TTEST_4
2017-11-23 04:58:44 +08:00
if (!ND_TTEST_2(cp))
Audit DNS printer for buffer overflows. Use TTEST2() in tests, and make some additional tests (some of which might, in theory, be unnecessary, but...). Check for null pointers *before* checking whether there's enough data at the pointer in question.
2001-02-23 16:55:21 +08:00
return(NULL);
Use the new GET_ macros instead of the EXTRACT_ ones The exceptions are currently: Some EXTRACT_ in print-juniper.c, not used on packet buffer pointer. An EXTRACT_BE_U_3 in addrtoname.c, not always used on packet buffer pointer.
2018-06-16 23:23:21 +08:00
ND_PRINT(" maclen=%u", GET_BE_U_2(cp));
cp += 2 + GET_BE_U_2(cp);
Rename ND_TCHECK_/ND_TTEST_ macros Now all the macros have a name meaning a count in bytes. e.g.: ND_TCHECK_32BITS -> ND_TCHECK_4 ND_TTEST_32BITS -> ND_TTEST_4
2017-11-23 04:58:44 +08:00
if (!ND_TTEST_2(cp))
Audit DNS printer for buffer overflows. Use TTEST2() in tests, and make some additional tests (some of which might, in theory, be unnecessary, but...). Check for null pointers *before* checking whether there's enough data at the pointer in question.
2001-02-23 16:55:21 +08:00
return(NULL);
Use the new GET_ macros instead of the EXTRACT_ ones The exceptions are currently: Some EXTRACT_ in print-juniper.c, not used on packet buffer pointer. An EXTRACT_BE_U_3 in addrtoname.c, not always used on packet buffer pointer.
2018-06-16 23:23:21 +08:00
ND_PRINT(" origid=%u", GET_BE_U_2(cp));
slightly better TSIG decoding.
2001-02-20 15:22:17 +08:00
cp += 2;
Rename ND_TCHECK_/ND_TTEST_ macros Now all the macros have a name meaning a count in bytes. e.g.: ND_TCHECK_32BITS -> ND_TCHECK_4 ND_TTEST_32BITS -> ND_TTEST_4
2017-11-23 04:58:44 +08:00
if (!ND_TTEST_2(cp))
Audit DNS printer for buffer overflows. Use TTEST2() in tests, and make some additional tests (some of which might, in theory, be unnecessary, but...). Check for null pointers *before* checking whether there's enough data at the pointer in question.
2001-02-23 16:55:21 +08:00
return(NULL);
Use the new GET_ macros instead of the EXTRACT_ ones The exceptions are currently: Some EXTRACT_ in print-juniper.c, not used on packet buffer pointer. An EXTRACT_BE_U_3 in addrtoname.c, not always used on packet buffer pointer.
2018-06-16 23:23:21 +08:00
ND_PRINT(" error=%u", GET_BE_U_2(cp));
slightly better TSIG decoding.
2001-02-20 15:22:17 +08:00
cp += 2;
Rename ND_TCHECK_/ND_TTEST_ macros Now all the macros have a name meaning a count in bytes. e.g.: ND_TCHECK_32BITS -> ND_TCHECK_4 ND_TTEST_32BITS -> ND_TTEST_4
2017-11-23 04:58:44 +08:00
if (!ND_TTEST_2(cp))
Audit DNS printer for buffer overflows. Use TTEST2() in tests, and make some additional tests (some of which might, in theory, be unnecessary, but...). Check for null pointers *before* checking whether there's enough data at the pointer in question.
2001-02-23 16:55:21 +08:00
return(NULL);
Use the new GET_ macros instead of the EXTRACT_ ones The exceptions are currently: Some EXTRACT_ in print-juniper.c, not used on packet buffer pointer. An EXTRACT_BE_U_3 in addrtoname.c, not always used on packet buffer pointer.
2018-06-16 23:23:21 +08:00
ND_PRINT(" otherlen=%u", GET_BE_U_2(cp));
slightly better TSIG decoding.
2001-02-20 15:22:17 +08:00
cp += 2;
}
Initial revision
1999-10-08 07:47:09 +08:00
}
return (rp); /* XXX This isn't always right */
}
void
DNS: Rename entry function Most printer entry functions are based on the file name (without print-). Do the same for DNS (ns_print -> domain_print) This change allows easier update by script.
2017-11-16 16:40:19 +08:00
domain_print(netdissect_options *ndo,
Remove all storage class specifier 'register' Let the compiler do the optimizations (or not) based on build options. Avoid 'value has been optimized out' messages in gdb using '-O0'.
2017-12-14 02:17:47 +08:00
const u_char *bp, u_int length, int is_mdns)
Initial revision
1999-10-08 07:47:09 +08:00
{
DNS: Coding style update
2018-01-02 23:57:13 +08:00
const dns_header_t *np;
Extract extend DNS rcode from OPT record and print it.
2019-02-13 06:50:17 +08:00
uint16_t flags, rcode, rdlen, type;
Use nd_ types for DNS. Make some types unsigned, and fix some loops to no longer depend on a zero count rolling over to -1 when decremented.
2017-12-14 01:32:44 +08:00
u_int qdcount, ancount, nscount, arcount;
u_int i;
Remove all storage class specifier 'register' Let the compiler do the optimizations (or not) based on build options. Avoid 'value has been optimized out' messages in gdb using '-O0'.
2017-12-14 02:17:47 +08:00
const u_char *cp;
u_intN_t is dead, long live uintN_t. And, as we require at least autoconf 2.61, and as autoconf 2.61 and later have AC_TYPE_UINTn_T and AC_TYPE_INTn_T macros, we use them to define the uintN_t and intN_t macros if the system doesn't define them for us. This lets us get rid of bitypes.h as well.
2014-04-23 15:20:40 +08:00
uint16_t b2;
Initial revision
1999-10-08 07:47:09 +08:00
Add the ndo_protocol field in the netdissect_options structure Update this field in printer entry functions. It will be used for some printings.
2018-03-14 23:54:17 +08:00
ndo->ndo_protocol = "domain";
DNS: Coding style update
2018-01-02 23:57:13 +08:00
np = (const dns_header_t *)bp;
Use ND_TTEST_SIZE()/ND_TCHECK_SIZE() macros (1/n)
2018-01-04 04:32:07 +08:00
ND_TCHECK_SIZE(np);
Use the new GET_ macros instead of the EXTRACT_ ones The exceptions are currently: Some EXTRACT_ in print-juniper.c, not used on packet buffer pointer. An EXTRACT_BE_U_3 in addrtoname.c, not always used on packet buffer pointer.
2018-06-16 23:23:21 +08:00
flags = GET_BE_U_2(np->flags);
Initial revision
1999-10-08 07:47:09 +08:00
/* get the byte-order right */
Use the new GET_ macros instead of the EXTRACT_ ones The exceptions are currently: Some EXTRACT_ in print-juniper.c, not used on packet buffer pointer. An EXTRACT_BE_U_3 in addrtoname.c, not always used on packet buffer pointer.
2018-06-16 23:23:21 +08:00
qdcount = GET_BE_U_2(np->qdcount);
ancount = GET_BE_U_2(np->ancount);
nscount = GET_BE_U_2(np->nscount);
arcount = GET_BE_U_2(np->arcount);
Initial revision
1999-10-08 07:47:09 +08:00
Extract extend DNS rcode from OPT record and print it.
2019-02-13 06:50:17 +08:00
/* find the opt record to extract extended rcode */
cp = (const u_char *)(np + 1);
rcode = DNS_RCODE(flags);
for (i = 0; i < qdcount; i++) {
if ((cp = ns_nskip(ndo, cp)) == NULL)
goto print;
cp += 4; /* skip QTYPE and QCLASS */
if (cp >= ndo->ndo_snapend)
goto print;
}
for (i = 0; i < ancount + nscount; i++) {
if ((cp = ns_nskip(ndo, cp)) == NULL)
goto print;
cp += 8; /* skip TYPE, CLASS and TTL */
if (cp + 2 > ndo->ndo_snapend)
goto print;
Use the new GET_ macros instead of the EXTRACT_ ones The exceptions are currently: Some EXTRACT_ in print-juniper.c, not used on packet buffer pointer. An EXTRACT_BE_U_3 in addrtoname.c, not always used on packet buffer pointer.
2018-06-16 23:23:21 +08:00
rdlen = GET_BE_U_2(cp);
Extract extend DNS rcode from OPT record and print it.
2019-02-13 06:50:17 +08:00
cp += 2 + rdlen;
if (cp >= ndo->ndo_snapend)
goto print;
}
for (i = 0; i < arcount; i++) {
if ((cp = ns_nskip(ndo, cp)) == NULL)
goto print;
if (cp + 2 > ndo->ndo_snapend)
goto print;
Use the new GET_ macros instead of the EXTRACT_ ones The exceptions are currently: Some EXTRACT_ in print-juniper.c, not used on packet buffer pointer. An EXTRACT_BE_U_3 in addrtoname.c, not always used on packet buffer pointer.
2018-06-16 23:23:21 +08:00
type = GET_BE_U_2(cp);
Extract extend DNS rcode from OPT record and print it.
2019-02-13 06:50:17 +08:00
cp += 4; /* skip TYPE and CLASS */
if (cp + 1 > ndo->ndo_snapend)
goto print;
if (type == T_OPT) {
rcode |= (*cp << 4);
goto print;
}
cp += 4;
if (cp + 2 > ndo->ndo_snapend)
goto print;
Use the new GET_ macros instead of the EXTRACT_ ones The exceptions are currently: Some EXTRACT_ in print-juniper.c, not used on packet buffer pointer. An EXTRACT_BE_U_3 in addrtoname.c, not always used on packet buffer pointer.
2018-06-16 23:23:21 +08:00
rdlen = GET_BE_U_2(cp);
Extract extend DNS rcode from OPT record and print it.
2019-02-13 06:50:17 +08:00
cp += 2 + rdlen;
if (cp >= ndo->ndo_snapend)
goto print;
}
print:
Use nd_ types for DNS. Make some types unsigned, and fix some loops to no longer depend on a zero count rolling over to -1 when decremented.
2017-12-14 01:32:44 +08:00
if (DNS_QR(flags)) {
Initial revision
1999-10-08 07:47:09 +08:00
/* this is a response */
Clean up signed vs. unsigned.
2018-01-12 03:52:30 +08:00
ND_PRINT("%u%s%s%s%s%s%s",
Use the new GET_ macros instead of the EXTRACT_ ones The exceptions are currently: Some EXTRACT_ in print-juniper.c, not used on packet buffer pointer. An EXTRACT_BE_U_3 in addrtoname.c, not always used on packet buffer pointer.
2018-06-16 23:23:21 +08:00
GET_BE_U_2(np->id),
Use nd_ types for DNS. Make some types unsigned, and fix some loops to no longer depend on a zero count rolling over to -1 when decremented.
2017-12-14 01:32:44 +08:00
ns_ops[DNS_OPCODE(flags)],
Extract extend DNS rcode from OPT record and print it.
2019-02-13 06:50:17 +08:00
ns_rcode(rcode),
Use nd_ types for DNS. Make some types unsigned, and fix some loops to no longer depend on a zero count rolling over to -1 when decremented.
2017-12-14 01:32:44 +08:00
DNS_AA(flags)? "*" : "",
DNS_RA(flags)? "" : "-",
DNS_TC(flags)? "|" : "",
Update ND_PRINT() as a variadic macro
2018-01-07 18:47:30 +08:00
DNS_AD(flags)? "$" : "");
parse authentication-related bits from BIND9. may require recent arpa/nameser.h.
2000-04-27 11:44:05 +08:00
Initial revision
1999-10-08 07:47:09 +08:00
if (qdcount != 1)
Update ND_PRINT() as a variadic macro
2018-01-07 18:47:30 +08:00
ND_PRINT(" [%uq]", qdcount);
Initial revision
1999-10-08 07:47:09 +08:00
/* Print QUESTION section on -vv */
do not SEGV if there's no query section
2001-02-20 14:03:42 +08:00
cp = (const u_char *)(np + 1);
Use nd_ types for DNS. Make some types unsigned, and fix some loops to no longer depend on a zero count rolling over to -1 when decremented.
2017-12-14 01:32:44 +08:00
for (i = 0; i < qdcount; i++) {
if (i != 0)
Update ND_PRINT() as a variadic macro
2018-01-07 18:47:30 +08:00
ND_PRINT(",");
NDOize BOOTP, DHCPv6, DNS, PIM and sFlow decoders Also add/remove tabs in a few involved functions to justify indentation.
2014-03-25 19:05:59 +08:00
if (ndo->ndo_vflag > 1) {
Update ND_PRINT() as a variadic macro
2018-01-07 18:47:30 +08:00
ND_PRINT(" q:");
NDOize BOOTP, DHCPv6, DNS, PIM and sFlow decoders Also add/remove tabs in a few involved functions to justify indentation.
2014-03-25 19:05:59 +08:00
if ((cp = ns_qprint(ndo, cp, bp, is_mdns)) == NULL)
fix query section decoding
2001-02-03 13:04:33 +08:00
goto trunc;
} else {
NDOize BOOTP, DHCPv6, DNS, PIM and sFlow decoders Also add/remove tabs in a few involved functions to justify indentation.
2014-03-25 19:05:59 +08:00
if ((cp = ns_nskip(ndo, cp)) == NULL)
fix query section decoding
2001-02-03 13:04:33 +08:00
goto trunc;
cp += 4; /* skip QTYPE and QCLASS */
}
support DNAME and bit string label. more pedantic snapend validation. {jinmei,itojun}@kame.net
2000-12-29 04:30:41 +08:00
}
Update ND_PRINT() as a variadic macro
2018-01-07 18:47:30 +08:00
ND_PRINT(" %u/%u/%u", ancount, nscount, arcount);
Use nd_ types for DNS. Make some types unsigned, and fix some loops to no longer depend on a zero count rolling over to -1 when decremented.
2017-12-14 01:32:44 +08:00
if (ancount) {
NDOize BOOTP, DHCPv6, DNS, PIM and sFlow decoders Also add/remove tabs in a few involved functions to justify indentation.
2014-03-25 19:05:59 +08:00
if ((cp = ns_rprint(ndo, cp, bp, is_mdns)) == NULL)
support DNAME and bit string label. more pedantic snapend validation. {jinmei,itojun}@kame.net
2000-12-29 04:30:41 +08:00
goto trunc;
Use nd_ types for DNS. Make some types unsigned, and fix some loops to no longer depend on a zero count rolling over to -1 when decremented.
2017-12-14 01:32:44 +08:00
ancount--;
while (cp < ndo->ndo_snapend && ancount) {
Update ND_PRINT() as a variadic macro
2018-01-07 18:47:30 +08:00
ND_PRINT(",");
NDOize BOOTP, DHCPv6, DNS, PIM and sFlow decoders Also add/remove tabs in a few involved functions to justify indentation.
2014-03-25 19:05:59 +08:00
if ((cp = ns_rprint(ndo, cp, bp, is_mdns)) == NULL)
support DNAME and bit string label. more pedantic snapend validation. {jinmei,itojun}@kame.net
2000-12-29 04:30:41 +08:00
goto trunc;
Use nd_ types for DNS. Make some types unsigned, and fix some loops to no longer depend on a zero count rolling over to -1 when decremented.
2017-12-14 01:32:44 +08:00
ancount--;
support DNAME and bit string label. more pedantic snapend validation. {jinmei,itojun}@kame.net
2000-12-29 04:30:41 +08:00
}
}
Use nd_ types for DNS. Make some types unsigned, and fix some loops to no longer depend on a zero count rolling over to -1 when decremented.
2017-12-14 01:32:44 +08:00
if (ancount)
print truncated message in a more friendly manner. from jinmei@kame.net
2001-01-12 23:06:06 +08:00
goto trunc;
support DNAME and bit string label. more pedantic snapend validation. {jinmei,itojun}@kame.net
2000-12-29 04:30:41 +08:00
/* Print NS and AR sections on -vv */
NDOize BOOTP, DHCPv6, DNS, PIM and sFlow decoders Also add/remove tabs in a few involved functions to justify indentation.
2014-03-25 19:05:59 +08:00
if (ndo->ndo_vflag > 1) {
Use nd_ types for DNS. Make some types unsigned, and fix some loops to no longer depend on a zero count rolling over to -1 when decremented.
2017-12-14 01:32:44 +08:00
if (cp < ndo->ndo_snapend && nscount) {
Update ND_PRINT() as a variadic macro
2018-01-07 18:47:30 +08:00
ND_PRINT(" ns:");
NDOize BOOTP, DHCPv6, DNS, PIM and sFlow decoders Also add/remove tabs in a few involved functions to justify indentation.
2014-03-25 19:05:59 +08:00
if ((cp = ns_rprint(ndo, cp, bp, is_mdns)) == NULL)
support DNAME and bit string label. more pedantic snapend validation. {jinmei,itojun}@kame.net
2000-12-29 04:30:41 +08:00
goto trunc;
Use nd_ types for DNS. Make some types unsigned, and fix some loops to no longer depend on a zero count rolling over to -1 when decremented.
2017-12-14 01:32:44 +08:00
nscount--;
while (cp < ndo->ndo_snapend && nscount) {
Update ND_PRINT() as a variadic macro
2018-01-07 18:47:30 +08:00
ND_PRINT(",");
NDOize BOOTP, DHCPv6, DNS, PIM and sFlow decoders Also add/remove tabs in a few involved functions to justify indentation.
2014-03-25 19:05:59 +08:00
if ((cp = ns_rprint(ndo, cp, bp, is_mdns)) == NULL)
support DNAME and bit string label. more pedantic snapend validation. {jinmei,itojun}@kame.net
2000-12-29 04:30:41 +08:00
goto trunc;
Use nd_ types for DNS. Make some types unsigned, and fix some loops to no longer depend on a zero count rolling over to -1 when decremented.
2017-12-14 01:32:44 +08:00
nscount--;
support DNAME and bit string label. more pedantic snapend validation. {jinmei,itojun}@kame.net
2000-12-29 04:30:41 +08:00
}
}
Use nd_ types for DNS. Make some types unsigned, and fix some loops to no longer depend on a zero count rolling over to -1 when decremented.
2017-12-14 01:32:44 +08:00
if (nscount)
print truncated message in a more friendly manner. from jinmei@kame.net
2001-01-12 23:06:06 +08:00
goto trunc;
Use nd_ types for DNS. Make some types unsigned, and fix some loops to no longer depend on a zero count rolling over to -1 when decremented.
2017-12-14 01:32:44 +08:00
if (cp < ndo->ndo_snapend && arcount) {
Update ND_PRINT() as a variadic macro
2018-01-07 18:47:30 +08:00
ND_PRINT(" ar:");
NDOize BOOTP, DHCPv6, DNS, PIM and sFlow decoders Also add/remove tabs in a few involved functions to justify indentation.
2014-03-25 19:05:59 +08:00
if ((cp = ns_rprint(ndo, cp, bp, is_mdns)) == NULL)
support DNAME and bit string label. more pedantic snapend validation. {jinmei,itojun}@kame.net
2000-12-29 04:30:41 +08:00
goto trunc;
Use nd_ types for DNS. Make some types unsigned, and fix some loops to no longer depend on a zero count rolling over to -1 when decremented.
2017-12-14 01:32:44 +08:00
arcount--;
while (cp < ndo->ndo_snapend && arcount) {
Update ND_PRINT() as a variadic macro
2018-01-07 18:47:30 +08:00
ND_PRINT(",");
NDOize BOOTP, DHCPv6, DNS, PIM and sFlow decoders Also add/remove tabs in a few involved functions to justify indentation.
2014-03-25 19:05:59 +08:00
if ((cp = ns_rprint(ndo, cp, bp, is_mdns)) == NULL)
support DNAME and bit string label. more pedantic snapend validation. {jinmei,itojun}@kame.net
2000-12-29 04:30:41 +08:00
goto trunc;
Use nd_ types for DNS. Make some types unsigned, and fix some loops to no longer depend on a zero count rolling over to -1 when decremented.
2017-12-14 01:32:44 +08:00
arcount--;
support DNAME and bit string label. more pedantic snapend validation. {jinmei,itojun}@kame.net
2000-12-29 04:30:41 +08:00
}
Initial revision
1999-10-08 07:47:09 +08:00
}
Use nd_ types for DNS. Make some types unsigned, and fix some loops to no longer depend on a zero count rolling over to -1 when decremented.
2017-12-14 01:32:44 +08:00
if (arcount)
print truncated message in a more friendly manner. from jinmei@kame.net
2001-01-12 23:06:06 +08:00
goto trunc;
Initial revision
1999-10-08 07:47:09 +08:00
}
}
else {
/* this is a request */
Use the new GET_ macros instead of the EXTRACT_ ones The exceptions are currently: Some EXTRACT_ in print-juniper.c, not used on packet buffer pointer. An EXTRACT_BE_U_3 in addrtoname.c, not always used on packet buffer pointer.
2018-06-16 23:23:21 +08:00
ND_PRINT("%u%s%s%s", GET_BE_U_2(np->id),
ns_ops[DNS_OPCODE(flags)],
Use nd_ types for DNS. Make some types unsigned, and fix some loops to no longer depend on a zero count rolling over to -1 when decremented.
2017-12-14 01:32:44 +08:00
DNS_RD(flags) ? "+" : "",
Update ND_PRINT() as a variadic macro
2018-01-07 18:47:30 +08:00
DNS_CD(flags) ? "%" : "");
Initial revision
1999-10-08 07:47:09 +08:00
/* any weirdness? */
Use the new GET_ macros instead of the EXTRACT_ ones The exceptions are currently: Some EXTRACT_ in print-juniper.c, not used on packet buffer pointer. An EXTRACT_BE_U_3 in addrtoname.c, not always used on packet buffer pointer.
2018-06-16 23:23:21 +08:00
b2 = GET_BE_U_2(((const u_short *)np) + 1);
The "__attribute__((packed))" tag on structures causes some files not to compile with Sun C, as "interface.h" isn't being included before the structures are being declared. Furthermore, in the files that Sun C *can* compile, it doesn't cause Sun C to generate code that's safe with unaligned accesses, as "__attribute__" is defined as a do-nothing macro with compilers that don't support it. Therefore, we get rid of that tag on the structures to which it was added, and instead use "EXTRACT_16BIT()" and "EXTRACT_32BIT()" to fetch 16-bit and 32-bit big-endian quantities from packets. We also fix some other references to multi-byte quantities to get rid of code that tries to do unaligned loads on platforms that don't support them. We also throw in a hack that makes those macros use "__attribute__((packed))" on structures containing only one 16-bit or 32-bit integer to get the compiler to generate unaligned-safe code rather than doing it by hand. (GCC on SPARC produces the same code that doing it by hand does; I don't know if GCC on any other big-endian strict-alignment processor generates better code for that case. On little-endian processors, as "ntohs()" and "ntohl()" might be functions, that might actually produce worse code.) Fix some places to use "%u" rather than "%d" to print unsigned quantities.
2002-12-11 15:13:49 +08:00
if (b2 & 0x6cf)
Update ND_PRINT() as a variadic macro
2018-01-07 18:47:30 +08:00
ND_PRINT(" [b2&3=0x%x]", b2);
Initial revision
1999-10-08 07:47:09 +08:00
Use nd_ types for DNS. Make some types unsigned, and fix some loops to no longer depend on a zero count rolling over to -1 when decremented.
2017-12-14 01:32:44 +08:00
if (DNS_OPCODE(flags) == IQUERY) {
Initial revision
1999-10-08 07:47:09 +08:00
if (qdcount)
Update ND_PRINT() as a variadic macro
2018-01-07 18:47:30 +08:00
ND_PRINT(" [%uq]", qdcount);
Initial revision
1999-10-08 07:47:09 +08:00
if (ancount != 1)
Update ND_PRINT() as a variadic macro
2018-01-07 18:47:30 +08:00
ND_PRINT(" [%ua]", ancount);
Initial revision
1999-10-08 07:47:09 +08:00
}
else {
if (ancount)
Update ND_PRINT() as a variadic macro
2018-01-07 18:47:30 +08:00
ND_PRINT(" [%ua]", ancount);
Initial revision
1999-10-08 07:47:09 +08:00
if (qdcount != 1)
Update ND_PRINT() as a variadic macro
2018-01-07 18:47:30 +08:00
ND_PRINT(" [%uq]", qdcount);
Initial revision
1999-10-08 07:47:09 +08:00
}
if (nscount)
Update ND_PRINT() as a variadic macro
2018-01-07 18:47:30 +08:00
ND_PRINT(" [%un]", nscount);
Initial revision
1999-10-08 07:47:09 +08:00
if (arcount)
Update ND_PRINT() as a variadic macro
2018-01-07 18:47:30 +08:00
ND_PRINT(" [%uau]", arcount);
Initial revision
1999-10-08 07:47:09 +08:00
Get rid of a null-pointer dereference when dissecting DNS requests with a query count of 0 (no, such a request makes no sense, but that's what tcpdump thought it saw in one DNS-over-TCP capture).
2001-10-19 17:00:48 +08:00
cp = (const u_char *)(np + 1);
Use nd_ types for DNS. Make some types unsigned, and fix some loops to no longer depend on a zero count rolling over to -1 when decremented.
2017-12-14 01:32:44 +08:00
if (qdcount) {
NDOize BOOTP, DHCPv6, DNS, PIM and sFlow decoders Also add/remove tabs in a few involved functions to justify indentation.
2014-03-25 19:05:59 +08:00
cp = ns_qprint(ndo, cp, (const u_char *)np, is_mdns);
avoid segfault (NULL pointer deref)
2001-01-01 12:22:56 +08:00
if (!cp)
goto trunc;
Use nd_ types for DNS. Make some types unsigned, and fix some loops to no longer depend on a zero count rolling over to -1 when decremented.
2017-12-14 01:32:44 +08:00
qdcount--;
while (cp < ndo->ndo_snapend && qdcount) {
NDOize BOOTP, DHCPv6, DNS, PIM and sFlow decoders Also add/remove tabs in a few involved functions to justify indentation.
2014-03-25 19:05:59 +08:00
cp = ns_qprint(ndo, (const u_char *)cp,
In mDNS, report IN-class records with the "cache flush" bit set as such, rather than as "Class 32769".
2003-11-05 14:02:58 +08:00
(const u_char *)np,
is_mdns);
avoid segfault (NULL pointer deref)
2001-01-01 12:22:56 +08:00
if (!cp)
goto trunc;
Use nd_ types for DNS. Make some types unsigned, and fix some loops to no longer depend on a zero count rolling over to -1 when decremented.
2017-12-14 01:32:44 +08:00
qdcount--;
parse EDNS0.
2000-12-30 17:06:21 +08:00
}
}
Use nd_ types for DNS. Make some types unsigned, and fix some loops to no longer depend on a zero count rolling over to -1 when decremented.
2017-12-14 01:32:44 +08:00
if (qdcount)
print truncated message in a more friendly manner. from jinmei@kame.net
2001-01-12 23:06:06 +08:00
goto trunc;
parse EDNS0.
2000-12-30 17:06:21 +08:00
/* Print remaining sections on -vv */
NDOize BOOTP, DHCPv6, DNS, PIM and sFlow decoders Also add/remove tabs in a few involved functions to justify indentation.
2014-03-25 19:05:59 +08:00
if (ndo->ndo_vflag > 1) {
Use nd_ types for DNS. Make some types unsigned, and fix some loops to no longer depend on a zero count rolling over to -1 when decremented.
2017-12-14 01:32:44 +08:00
if (ancount) {
NDOize BOOTP, DHCPv6, DNS, PIM and sFlow decoders Also add/remove tabs in a few involved functions to justify indentation.
2014-03-25 19:05:59 +08:00
if ((cp = ns_rprint(ndo, cp, bp, is_mdns)) == NULL)
parse EDNS0.
2000-12-30 17:06:21 +08:00
goto trunc;
Use nd_ types for DNS. Make some types unsigned, and fix some loops to no longer depend on a zero count rolling over to -1 when decremented.
2017-12-14 01:32:44 +08:00
ancount--;
while (cp < ndo->ndo_snapend && ancount) {
Update ND_PRINT() as a variadic macro
2018-01-07 18:47:30 +08:00
ND_PRINT(",");
NDOize BOOTP, DHCPv6, DNS, PIM and sFlow decoders Also add/remove tabs in a few involved functions to justify indentation.
2014-03-25 19:05:59 +08:00
if ((cp = ns_rprint(ndo, cp, bp, is_mdns)) == NULL)
parse EDNS0.
2000-12-30 17:06:21 +08:00
goto trunc;
Use nd_ types for DNS. Make some types unsigned, and fix some loops to no longer depend on a zero count rolling over to -1 when decremented.
2017-12-14 01:32:44 +08:00
ancount--;
parse EDNS0.
2000-12-30 17:06:21 +08:00
}
}
Use nd_ types for DNS. Make some types unsigned, and fix some loops to no longer depend on a zero count rolling over to -1 when decremented.
2017-12-14 01:32:44 +08:00
if (ancount)
print truncated message in a more friendly manner. from jinmei@kame.net
2001-01-12 23:06:06 +08:00
goto trunc;
Use nd_ types for DNS. Make some types unsigned, and fix some loops to no longer depend on a zero count rolling over to -1 when decremented.
2017-12-14 01:32:44 +08:00
if (cp < ndo->ndo_snapend && nscount) {
Update ND_PRINT() as a variadic macro
2018-01-07 18:47:30 +08:00
ND_PRINT(" ns:");
NDOize BOOTP, DHCPv6, DNS, PIM and sFlow decoders Also add/remove tabs in a few involved functions to justify indentation.
2014-03-25 19:05:59 +08:00
if ((cp = ns_rprint(ndo, cp, bp, is_mdns)) == NULL)
parse EDNS0.
2000-12-30 17:06:21 +08:00
goto trunc;
Use nd_ types for DNS. Make some types unsigned, and fix some loops to no longer depend on a zero count rolling over to -1 when decremented.
2017-12-14 01:32:44 +08:00
nscount--;
while (cp < ndo->ndo_snapend && nscount) {
Update ND_PRINT() as a variadic macro
2018-01-07 18:47:30 +08:00
ND_PRINT(",");
NDOize BOOTP, DHCPv6, DNS, PIM and sFlow decoders Also add/remove tabs in a few involved functions to justify indentation.
2014-03-25 19:05:59 +08:00
if ((cp = ns_rprint(ndo, cp, bp, is_mdns)) == NULL)
parse EDNS0.
2000-12-30 17:06:21 +08:00
goto trunc;
Use nd_ types for DNS. Make some types unsigned, and fix some loops to no longer depend on a zero count rolling over to -1 when decremented.
2017-12-14 01:32:44 +08:00
nscount--;
parse EDNS0.
2000-12-30 17:06:21 +08:00
}
}
print truncated message in a more friendly manner. from jinmei@kame.net
2001-01-12 23:06:06 +08:00
if (nscount > 0)
goto trunc;
Use nd_ types for DNS. Make some types unsigned, and fix some loops to no longer depend on a zero count rolling over to -1 when decremented.
2017-12-14 01:32:44 +08:00
if (cp < ndo->ndo_snapend && arcount) {
Update ND_PRINT() as a variadic macro
2018-01-07 18:47:30 +08:00
ND_PRINT(" ar:");
NDOize BOOTP, DHCPv6, DNS, PIM and sFlow decoders Also add/remove tabs in a few involved functions to justify indentation.
2014-03-25 19:05:59 +08:00
if ((cp = ns_rprint(ndo, cp, bp, is_mdns)) == NULL)
parse EDNS0.
2000-12-30 17:06:21 +08:00
goto trunc;
Use nd_ types for DNS. Make some types unsigned, and fix some loops to no longer depend on a zero count rolling over to -1 when decremented.
2017-12-14 01:32:44 +08:00
arcount--;
while (cp < ndo->ndo_snapend && arcount) {
Update ND_PRINT() as a variadic macro
2018-01-07 18:47:30 +08:00
ND_PRINT(",");
NDOize BOOTP, DHCPv6, DNS, PIM and sFlow decoders Also add/remove tabs in a few involved functions to justify indentation.
2014-03-25 19:05:59 +08:00
if ((cp = ns_rprint(ndo, cp, bp, is_mdns)) == NULL)
parse EDNS0.
2000-12-30 17:06:21 +08:00
goto trunc;
Use nd_ types for DNS. Make some types unsigned, and fix some loops to no longer depend on a zero count rolling over to -1 when decremented.
2017-12-14 01:32:44 +08:00
arcount--;
parse EDNS0.
2000-12-30 17:06:21 +08:00
}
}
Use nd_ types for DNS. Make some types unsigned, and fix some loops to no longer depend on a zero count rolling over to -1 when decremented.
2017-12-14 01:32:44 +08:00
if (arcount)
print truncated message in a more friendly manner. from jinmei@kame.net
2001-01-12 23:06:06 +08:00
goto trunc;
parse EDNS0.
2000-12-30 17:06:21 +08:00
}
Initial revision
1999-10-08 07:47:09 +08:00
}
Clean up signed vs. unsigned.
2018-01-12 03:52:30 +08:00
ND_PRINT(" (%u)", length);
support DNAME and bit string label. more pedantic snapend validation. {jinmei,itojun}@kame.net
2000-12-29 04:30:41 +08:00
return;
trunc:
Add more nd_print_trunc() calls Update the output of some tests accordingly. Moreover: Add a ndo_protocol field assignment.
2018-05-11 00:05:56 +08:00
nd_print_trunc(ndo);
Initial revision
1999-10-08 07:47:09 +08:00
}
Reference in New Issue Copy Permalink