Flatten vendor/tcpdump and remove keyword expansion.

1 files changed, 0 insertions, 157 deletions

diff --git a/contrib/tcpdump/print-sunrpc.c b/contrib/tcpdump/print-sunrpc.c
deleted file mode 100644
index 03e28a4..0000000
--- a/contrib/tcpdump/print-sunrpc.c
+++ /dev/null
@@ -1,157 +0,0 @@
-/*
- * Copyright (c) 1992, 1993, 1994, 1995, 1996
- *	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.
- */
-
-#ifndef lint
-static const char rcsid[] _U_ =
-    "@(#) $Header: /tcpdump/master/tcpdump/print-sunrpc.c,v 1.46.2.1 2005/04/27 21:44:06 guy Exp $ (LBL)";
-#endif
-
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
-#include <tcpdump-stdinc.h>
-
-#ifdef HAVE_GETRPCBYNUMBER
-#include <rpc/rpc.h>
-#ifdef HAVE_RPC_RPCENT_H
-#include <rpc/rpcent.h>
-#endif /* HAVE_RPC_RPCENT_H */
-#endif /* HAVE_GETRPCBYNUMBER */
-
-#include <stdio.h>
-#include <string.h>
-
-#include "interface.h"
-#include "addrtoname.h"
-#include "extract.h"
-
-#include "ip.h"
-#ifdef INET6
-#include "ip6.h"
-#endif
-
-#include "rpc_auth.h"
-#include "rpc_msg.h"
-#include "pmap_prot.h"
-
-static struct tok proc2str[] = {
-	{ SUNRPC_PMAPPROC_NULL,		"null" },
-	{ SUNRPC_PMAPPROC_SET,		"set" },
-	{ SUNRPC_PMAPPROC_UNSET,	"unset" },
-	{ SUNRPC_PMAPPROC_GETPORT,	"getport" },
-	{ SUNRPC_PMAPPROC_DUMP,		"dump" },
-	{ SUNRPC_PMAPPROC_CALLIT,	"call" },
-	{ 0,				NULL }
-};
-
-/* Forwards */
-static char *progstr(u_int32_t);
-
-void
-sunrpcrequest_print(register const u_char *bp, register u_int length,
-		    register const u_char *bp2)
-{
-	register const struct sunrpc_msg *rp;
-	register const struct ip *ip;
-#ifdef INET6
-	register const struct ip6_hdr *ip6;
-#endif
-	u_int32_t x;
-	char srcid[20], dstid[20];	/*fits 32bit*/
-
-	rp = (struct sunrpc_msg *)bp;
-
-	if (!nflag) {
-		snprintf(srcid, sizeof(srcid), "0x%x",
-		    EXTRACT_32BITS(&rp->rm_xid));
-		strlcpy(dstid, "sunrpc", sizeof(dstid));
-	} else {
-		snprintf(srcid, sizeof(srcid), "0x%x",
-		    EXTRACT_32BITS(&rp->rm_xid));
-		snprintf(dstid, sizeof(dstid), "0x%x", SUNRPC_PMAPPORT);
-	}
-
-	switch (IP_V((struct ip *)bp2)) {
-	case 4:
-		ip = (struct ip *)bp2;
-		printf("%s.%s > %s.%s: %d",
-		    ipaddr_string(&ip->ip_src), srcid,
-		    ipaddr_string(&ip->ip_dst), dstid, length);
-		break;
-#ifdef INET6
-	case 6:
-		ip6 = (struct ip6_hdr *)bp2;
-		printf("%s.%s > %s.%s: %d",
-		    ip6addr_string(&ip6->ip6_src), srcid,
-		    ip6addr_string(&ip6->ip6_dst), dstid, length);
-		break;
-#endif
-	default:
-		printf("%s.%s > %s.%s: %d", "?", srcid, "?", dstid, length);
-		break;
-	}
-
-	printf(" %s", tok2str(proc2str, " proc #%u",
-	    EXTRACT_32BITS(&rp->rm_call.cb_proc)));
-	x = EXTRACT_32BITS(&rp->rm_call.cb_rpcvers);
-	if (x != 2)
-		printf(" [rpcver %u]", x);
-
-	switch (EXTRACT_32BITS(&rp->rm_call.cb_proc)) {
-
-	case SUNRPC_PMAPPROC_SET:
-	case SUNRPC_PMAPPROC_UNSET:
-	case SUNRPC_PMAPPROC_GETPORT:
-	case SUNRPC_PMAPPROC_CALLIT:
-		x = EXTRACT_32BITS(&rp->rm_call.cb_prog);
-		if (!nflag)
-			printf(" %s", progstr(x));
-		else
-			printf(" %u", x);
-		printf(".%u", EXTRACT_32BITS(&rp->rm_call.cb_vers));
-		break;
-	}
-}
-
-static char *
-progstr(prog)
-	u_int32_t prog;
-{
-#ifdef HAVE_GETRPCBYNUMBER
-	register struct rpcent *rp;
-#endif
-	static char buf[32];
-	static u_int32_t lastprog = 0;
-
-	if (lastprog != 0 && prog == lastprog)
-		return (buf);
-#ifdef HAVE_GETRPCBYNUMBER
-	rp = getrpcbynumber(prog);
-	if (rp == NULL)
-#endif
-		(void) snprintf(buf, sizeof(buf), "#%u", prog);
-#ifdef HAVE_GETRPCBYNUMBER
-	else
-		strlcpy(buf, rp->r_name, sizeof(buf));
-#endif
-	return (buf);
-}