Flatten vendor/tcpdump and remove keyword expansion.

1 files changed, 0 insertions, 601 deletions

diff --git a/contrib/tcpdump/print-lwres.c b/contrib/tcpdump/print-lwres.c
deleted file mode 100644
index d0d6fe1..0000000
--- a/contrib/tcpdump/print-lwres.c
+++ /dev/null
@@ -1,601 +0,0 @@
-/*
- * Copyright (C) 2001 WIDE Project.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. Neither the name of the project 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 BY THE PROJECT AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE PROJECT OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#ifndef lint
-static const char rcsid[] _U_ =
-    "@(#) $Header: /tcpdump/master/tcpdump/print-lwres.c,v 1.13 2004/03/24 01:54:29 guy Exp $ (LBL)";
-#endif
-
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
-#include <tcpdump-stdinc.h>
-
-#include "nameser.h"
-
-#include <stdio.h>
-#include <string.h>
-
-#include "interface.h"
-#include "addrtoname.h"
-#include "extract.h"                    /* must come after interface.h */
-
-/* BIND9 lib/lwres/include/lwres */
-typedef u_int32_t lwres_uint32_t;
-typedef u_int16_t lwres_uint16_t;
-typedef u_int8_t lwres_uint8_t;
-
-struct lwres_lwpacket {
-	lwres_uint32_t		length;
-	lwres_uint16_t		version;
-	lwres_uint16_t		pktflags;
-	lwres_uint32_t		serial;
-	lwres_uint32_t		opcode;
-	lwres_uint32_t		result;
-	lwres_uint32_t		recvlength;
-	lwres_uint16_t		authtype;
-	lwres_uint16_t		authlength;
-};
-
-#define LWRES_LWPACKETFLAG_RESPONSE	0x0001U	/* if set, pkt is a response */
-
-#define LWRES_LWPACKETVERSION_0		0
-
-#define LWRES_FLAG_TRUSTNOTREQUIRED	0x00000001U
-#define LWRES_FLAG_SECUREDATA		0x00000002U
-
-/*
- * no-op
- */
-#define LWRES_OPCODE_NOOP		0x00000000U
-
-typedef struct {
-	/* public */
-	lwres_uint16_t			datalength;
-	/* data follows */
-} lwres_nooprequest_t;
-
-typedef struct {
-	/* public */
-	lwres_uint16_t			datalength;
-	/* data follows */
-} lwres_noopresponse_t;
-
-/*
- * get addresses by name
- */
-#define LWRES_OPCODE_GETADDRSBYNAME	0x00010001U
-
-typedef struct lwres_addr lwres_addr_t;
-
-struct lwres_addr {
-	lwres_uint32_t			family;
-	lwres_uint16_t			length;
-	/* address folows */
-};
-
-typedef struct {
-	/* public */
-	lwres_uint32_t			flags;
-	lwres_uint32_t			addrtypes;
-	lwres_uint16_t			namelen;
-	/* name follows */
-} lwres_gabnrequest_t;
-
-typedef struct {
-	/* public */
-	lwres_uint32_t			flags;
-	lwres_uint16_t			naliases;
-	lwres_uint16_t			naddrs;
-	lwres_uint16_t			realnamelen;
-	/* aliases follows */
-	/* addrs follows */
-	/* realname follows */
-} lwres_gabnresponse_t;
-
-/*
- * get name by address
- */
-#define LWRES_OPCODE_GETNAMEBYADDR	0x00010002U
-typedef struct {
-	/* public */
-	lwres_uint32_t			flags;
-	lwres_addr_t			addr;
-	/* addr body follows */
-} lwres_gnbarequest_t;
-
-typedef struct {
-	/* public */
-	lwres_uint32_t			flags;
-	lwres_uint16_t			naliases;
-	lwres_uint16_t			realnamelen;
-	/* aliases follows */
-	/* realname follows */
-} lwres_gnbaresponse_t;
-
-/*
- * get rdata by name
- */
-#define LWRES_OPCODE_GETRDATABYNAME	0x00010003U
-
-typedef struct {
-	/* public */
-	lwres_uint32_t			flags;
-	lwres_uint16_t			rdclass;
-	lwres_uint16_t			rdtype;
-	lwres_uint16_t			namelen;
-	/* name follows */
-} lwres_grbnrequest_t;
-
-typedef struct {
-	/* public */
-	lwres_uint32_t			flags;
-	lwres_uint16_t			rdclass;
-	lwres_uint16_t			rdtype;
-	lwres_uint32_t			ttl;
-	lwres_uint16_t			nrdatas;
-	lwres_uint16_t			nsigs;
-	/* realname here (len + name) */
-	/* rdata here (len + name) */
-	/* signatures here (len + name) */
-} lwres_grbnresponse_t;
-
-#define LWRDATA_VALIDATED	0x00000001
-
-#define LWRES_ADDRTYPE_V4		0x00000001U	/* ipv4 */
-#define LWRES_ADDRTYPE_V6		0x00000002U	/* ipv6 */
-
-#define LWRES_MAX_ALIASES		16		/* max # of aliases */
-#define LWRES_MAX_ADDRS			64		/* max # of addrs */
-
-struct tok opcode[] = {
-	{ LWRES_OPCODE_NOOP,		"noop", },
-	{ LWRES_OPCODE_GETADDRSBYNAME,	"getaddrsbyname", },
-	{ LWRES_OPCODE_GETNAMEBYADDR,	"getnamebyaddr", },
-	{ LWRES_OPCODE_GETRDATABYNAME,	"getrdatabyname", },
-	{ 0, 				NULL, },
-};
-
-/* print-domain.c */
-extern struct tok ns_type2str[];
-extern struct tok ns_class2str[];
-
-static int lwres_printname(size_t, const char *);
-static int lwres_printnamelen(const char *);
-static int lwres_printbinlen(const char *);
-static int lwres_printaddr(lwres_addr_t *);
-
-static int
-lwres_printname(size_t l, const char *p0)
-{
-	const char *p;
-	size_t i;
-
-	p = p0;
-	/* + 1 for terminating \0 */
-	if (p + l + 1 > (const char *)snapend)
-		goto trunc;
-
-	printf(" ");
-	for (i = 0; i < l; i++)
-		safeputchar(*p++);
-	p++;	/* skip terminating \0 */
-
-	return p - p0;
-
-  trunc:
-	return -1;
-}
-
-static int
-lwres_printnamelen(const char *p)
-{
-	u_int16_t l;
-	int advance;
-
-	if (p + 2 > (const char *)snapend)
-		goto trunc;
-	l = EXTRACT_16BITS(p);
-	advance = lwres_printname(l, p + 2);
-	if (advance < 0)
-		goto trunc;
-	return 2 + advance;
-
-  trunc:
-	return -1;
-}
-
-static int
-lwres_printbinlen(const char *p0)
-{
-	const char *p;
-	u_int16_t l;
-	int i;
-
-	p = p0;
-	if (p + 2 > (const char *)snapend)
-		goto trunc;
-	l = EXTRACT_16BITS(p);
-	if (p + 2 + l > (const char *)snapend)
-		goto trunc;
-	p += 2;
-	for (i = 0; i < l; i++)
-		printf("%02x", *p++);
-	return p - p0;
-
-  trunc:
-	return -1;
-}
-
-static int
-lwres_printaddr(lwres_addr_t *ap)
-{
-	u_int16_t l;
-	const char *p;
-	int i;
-
-	TCHECK(ap->length);
-	l = EXTRACT_16BITS(&ap->length);
-	/* XXX ap points to packed struct */
-	p = (const char *)&ap->length + sizeof(ap->length);
-	TCHECK2(*p, l);
-
-	switch (EXTRACT_32BITS(&ap->family)) {
-	case 1:	/* IPv4 */
-		if (l < 4)
-			return -1;
-		printf(" %s", ipaddr_string(p));
-		p += sizeof(struct in_addr);
-		break;
-#ifdef INET6
-	case 2:	/* IPv6 */
-		if (l < 16)
-			return -1;
-		printf(" %s", ip6addr_string(p));
-		p += sizeof(struct in6_addr);
-		break;
-#endif
-	default:
-		printf(" %u/", EXTRACT_32BITS(&ap->family));
-		for (i = 0; i < l; i++)
-			printf("%02x", *p++);
-	}
-
-	return p - (const char *)ap;
-
-  trunc:
-	return -1;
-}
-
-void
-lwres_print(register const u_char *bp, u_int length)
-{
-	const struct lwres_lwpacket *np;
-	u_int32_t v;
-	const char *s;
-	int response;
-	int advance;
-	int unsupported = 0;
-
-	np = (const struct lwres_lwpacket *)bp;
-	TCHECK(np->authlength);
-
-	printf(" lwres");
-	v = EXTRACT_16BITS(&np->version);
-	if (vflag || v != LWRES_LWPACKETVERSION_0)
-		printf(" v%u", v);
-	if (v != LWRES_LWPACKETVERSION_0) {
-		s = (const char *)np + EXTRACT_32BITS(&np->length);
-		goto tail;
-	}
-
-	response = EXTRACT_16BITS(&np->pktflags) & LWRES_LWPACKETFLAG_RESPONSE;
-
-	/* opcode and pktflags */
-	v = EXTRACT_32BITS(&np->opcode);
-	s = tok2str(opcode, "#0x%x", v);
-	printf(" %s%s", s, response ? "" : "?");
-
-	/* pktflags */
-	v = EXTRACT_16BITS(&np->pktflags);
-	if (v & ~LWRES_LWPACKETFLAG_RESPONSE)
-		printf("[0x%x]", v);
-
-	if (vflag > 1) {
-		printf(" (");	/*)*/
-		printf("serial:0x%x", EXTRACT_32BITS(&np->serial));
-		printf(" result:0x%x", EXTRACT_32BITS(&np->result));
-		printf(" recvlen:%u", EXTRACT_32BITS(&np->recvlength));
-		/* BIND910: not used */
-		if (vflag > 2) {
-			printf(" authtype:0x%x", EXTRACT_16BITS(&np->authtype));
-			printf(" authlen:%u", EXTRACT_16BITS(&np->authlength));
-		}
-		/*(*/
-		printf(")");
-	}
-
-	/* per-opcode content */
-	if (!response) {
-		/*
-		 * queries
-		 */
-		lwres_gabnrequest_t *gabn;
-		lwres_gnbarequest_t *gnba;
-		lwres_grbnrequest_t *grbn;
-		u_int32_t l;
-
-		gabn = NULL;
-		gnba = NULL;
-		grbn = NULL;
-
-		switch (EXTRACT_32BITS(&np->opcode)) {
-		case LWRES_OPCODE_NOOP:
-			break;
-		case LWRES_OPCODE_GETADDRSBYNAME:
-			gabn = (lwres_gabnrequest_t *)(np + 1);
-			TCHECK(gabn->namelen);
-			/* XXX gabn points to packed struct */
-			s = (const char *)&gabn->namelen +
-			    sizeof(gabn->namelen);
-			l = EXTRACT_16BITS(&gabn->namelen);
-
-			/* BIND910: not used */
-			if (vflag > 2) {
-				printf(" flags:0x%x",
-				    EXTRACT_32BITS(&gabn->flags));
-			}
-
-			v = EXTRACT_32BITS(&gabn->addrtypes);
-			switch (v & (LWRES_ADDRTYPE_V4 | LWRES_ADDRTYPE_V6)) {
-			case LWRES_ADDRTYPE_V4:
-				printf(" IPv4");
-				break;
-			case LWRES_ADDRTYPE_V6:
-				printf(" IPv6");
-				break;
-			case LWRES_ADDRTYPE_V4 | LWRES_ADDRTYPE_V6:
-				printf(" IPv4/6");
-				break;
-			}
-			if (v & ~(LWRES_ADDRTYPE_V4 | LWRES_ADDRTYPE_V6))
-				printf("[0x%x]", v);
-
-			advance = lwres_printname(l, s);
-			if (advance < 0)
-				goto trunc;
-			s += advance;
-			break;
-		case LWRES_OPCODE_GETNAMEBYADDR:
-			gnba = (lwres_gnbarequest_t *)(np + 1);
-			TCHECK(gnba->addr);
-
-			/* BIND910: not used */
-			if (vflag > 2) {
-				printf(" flags:0x%x",
-				    EXTRACT_32BITS(&gnba->flags));
-			}
-
-			s = (const char *)&gnba->addr;
-
-			advance = lwres_printaddr(&gnba->addr);
-			if (advance < 0)
-				goto trunc;
-			s += advance;
-			break;
-		case LWRES_OPCODE_GETRDATABYNAME:
-			/* XXX no trace, not tested */
-			grbn = (lwres_grbnrequest_t *)(np + 1);
-			TCHECK(grbn->namelen);
-
-			/* BIND910: not used */
-			if (vflag > 2) {
-				printf(" flags:0x%x",
-				    EXTRACT_32BITS(&grbn->flags));
-			}
-
-			printf(" %s", tok2str(ns_type2str, "Type%d",
-			    EXTRACT_16BITS(&grbn->rdtype)));
-			if (EXTRACT_16BITS(&grbn->rdclass) != C_IN) {
-				printf(" %s", tok2str(ns_class2str, "Class%d",
-				    EXTRACT_16BITS(&grbn->rdclass)));
-			}
-
-			/* XXX grbn points to packed struct */
-			s = (const char *)&grbn->namelen +
-			    sizeof(grbn->namelen);
-			l = EXTRACT_16BITS(&grbn->namelen);
-
-			advance = lwres_printname(l, s);
-			if (advance < 0)
-				goto trunc;
-			s += advance;
-			break;
-		default:
-			unsupported++;
-			break;
-		}
-	} else {
-		/*
-		 * responses
-		 */
-		lwres_gabnresponse_t *gabn;
-		lwres_gnbaresponse_t *gnba;
-		lwres_grbnresponse_t *grbn;
-		u_int32_t l, na;
-		u_int32_t i;
-
-		gabn = NULL;
-		gnba = NULL;
-		grbn = NULL;
-
-		switch (EXTRACT_32BITS(&np->opcode)) {
-		case LWRES_OPCODE_NOOP:
-			break;
-		case LWRES_OPCODE_GETADDRSBYNAME:
-			gabn = (lwres_gabnresponse_t *)(np + 1);
-			TCHECK(gabn->realnamelen);
-			/* XXX gabn points to packed struct */
-			s = (const char *)&gabn->realnamelen +
-			    sizeof(gabn->realnamelen);
-			l = EXTRACT_16BITS(&gabn->realnamelen);
-
-			/* BIND910: not used */
-			if (vflag > 2) {
-				printf(" flags:0x%x",
-				    EXTRACT_32BITS(&gabn->flags));
-			}
-
-			printf(" %u/%u", EXTRACT_16BITS(&gabn->naliases),
-			    EXTRACT_16BITS(&gabn->naddrs));
-
-			advance = lwres_printname(l, s);
-			if (advance < 0)
-				goto trunc;
-			s += advance;
-
-			/* aliases */
-			na = EXTRACT_16BITS(&gabn->naliases);
-			for (i = 0; i < na; i++) {
-				advance = lwres_printnamelen(s);
-				if (advance < 0)
-					goto trunc;
-				s += advance;
-			}
-
-			/* addrs */
-			na = EXTRACT_16BITS(&gabn->naddrs);
-			for (i = 0; i < na; i++) {
-				advance = lwres_printaddr((lwres_addr_t *)s);
-				if (advance < 0)
-					goto trunc;
-				s += advance;
-			}
-			break;
-		case LWRES_OPCODE_GETNAMEBYADDR:
-			gnba = (lwres_gnbaresponse_t *)(np + 1);
-			TCHECK(gnba->realnamelen);
-			/* XXX gnba points to packed struct */
-			s = (const char *)&gnba->realnamelen +
-			    sizeof(gnba->realnamelen);
-			l = EXTRACT_16BITS(&gnba->realnamelen);
-
-			/* BIND910: not used */
-			if (vflag > 2) {
-				printf(" flags:0x%x",
-				    EXTRACT_32BITS(&gnba->flags));
-			}
-
-			printf(" %u", EXTRACT_16BITS(&gnba->naliases));
-
-			advance = lwres_printname(l, s);
-			if (advance < 0)
-				goto trunc;
-			s += advance;
-
-			/* aliases */
-			na = EXTRACT_16BITS(&gnba->naliases);
-			for (i = 0; i < na; i++) {
-				advance = lwres_printnamelen(s);
-				if (advance < 0)
-					goto trunc;
-				s += advance;
-			}
-			break;
-		case LWRES_OPCODE_GETRDATABYNAME:
-			/* XXX no trace, not tested */
-			grbn = (lwres_grbnresponse_t *)(np + 1);
-			TCHECK(grbn->nsigs);
-
-			/* BIND910: not used */
-			if (vflag > 2) {
-				printf(" flags:0x%x",
-				    EXTRACT_32BITS(&grbn->flags));
-			}
-
-			printf(" %s", tok2str(ns_type2str, "Type%d",
-			    EXTRACT_16BITS(&grbn->rdtype)));
-			if (EXTRACT_16BITS(&grbn->rdclass) != C_IN) {
-				printf(" %s", tok2str(ns_class2str, "Class%d",
-				    EXTRACT_16BITS(&grbn->rdclass)));
-			}
-			printf(" TTL ");
-			relts_print(EXTRACT_32BITS(&grbn->ttl));
-			printf(" %u/%u", EXTRACT_16BITS(&grbn->nrdatas),
-			    EXTRACT_16BITS(&grbn->nsigs));
-
-			/* XXX grbn points to packed struct */
-			s = (const char *)&grbn->nsigs+ sizeof(grbn->nsigs);
-
-			advance = lwres_printnamelen(s);
-			if (advance < 0)
-				goto trunc;
-			s += advance;
-
-			/* rdatas */
-			na = EXTRACT_16BITS(&grbn->nrdatas);
-			for (i = 0; i < na; i++) {
-				/* XXX should decode resource data */
-				advance = lwres_printbinlen(s);
-				if (advance < 0)
-					goto trunc;
-				s += advance;
-			}
-
-			/* sigs */
-			na = EXTRACT_16BITS(&grbn->nsigs);
-			for (i = 0; i < na; i++) {
-				/* XXX how should we print it? */
-				advance = lwres_printbinlen(s);
-				if (advance < 0)
-					goto trunc;
-				s += advance;
-			}
-			break;
-		default:
-			unsupported++;
-			break;
-		}
-	}
-
-  tail:
-	/* length mismatch */
-	if (EXTRACT_32BITS(&np->length) != length) {
-		printf(" [len: %u != %u]", EXTRACT_32BITS(&np->length),
-		    length);
-	}
-	if (!unsupported && s < (const char *)np + EXTRACT_32BITS(&np->length))
-		printf("[extra]");
-	return;
-
-  trunc:
-	printf("[|lwres]");
-	return;
-}