Flatten vendor/tcpdump and remove keyword expansion.

1 files changed, 0 insertions, 336 deletions

diff --git a/contrib/tcpdump/print-atm.c b/contrib/tcpdump/print-atm.c
deleted file mode 100644
index d664d6e..0000000
--- a/contrib/tcpdump/print-atm.c
+++ /dev/null
@@ -1,336 +0,0 @@
-/*
- * Copyright (c) 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.
- */
-#ifndef lint
-static const char rcsid[] _U_ =
-    "@(#) $Header: /tcpdump/master/tcpdump/print-atm.c,v 1.38.2.6 2006/01/25 13:27:24 hannes Exp $ (LBL)";
-#endif
-
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
-#include <tcpdump-stdinc.h>
-
-#include <stdio.h>
-#include <pcap.h>
-#include <string.h>
-
-#include "interface.h"
-#include "extract.h"
-#include "addrtoname.h"
-#include "ethertype.h"
-#include "atm.h"
-#include "atmuni31.h"
-#include "llc.h"
-
-#include "ether.h"
-
-struct tok oam_f_values[] = {
-    { OAMF4SC, "OAM F4 (segment)" },
-    { OAMF4EC, "OAM F4 (end)" },
-    { 0, NULL }
-};
-
-struct tok oam_celltype_values[] = {
-    { 0x1, "Fault Management" },
-    { 0x2, "Performance Management" },
-    { 0x8, "activate/deactivate" },
-    { 0xf, "System Management" },
-    { 0, NULL }
-};
-
-struct tok oam_fm_functype_values[] = {
-    { 0x0, "AIS" },
-    { 0x1, "RDI" },
-    { 0x4, "Continuity Check" },
-    { 0x8, "Loopback" },
-    { 0, NULL }
-};
-
-struct tok oam_pm_functype_values[] = {
-    { 0x0, "Forward Monitoring" },
-    { 0x1, "Backward Reporting" },
-    { 0x2, "Monitoring and Reporting" },
-    { 0, NULL }
-};
-
-struct tok oam_ad_functype_values[] = {
-    { 0x0, "Performance Monitoring" },
-    { 0x1, "Continuity Check" },
-    { 0, NULL }
-};
-
-static const struct tok *oam_functype_values[16] = {
-    NULL,
-    oam_fm_functype_values, /* 1 */
-    oam_pm_functype_values, /* 2 */
-    NULL,
-    NULL,
-    NULL,
-    NULL,
-    NULL,
-    oam_ad_functype_values, /* 8 */
-    NULL,
-    NULL,
-    NULL,
-    NULL,
-    NULL,
-    NULL,
-    NULL
-};
-
-/*
- * Print an RFC 1483 LLC-encapsulated ATM frame.
- */
-static void
-atm_llc_print(const u_char *p, int length, int caplen)
-{
-	u_short extracted_ethertype;
-
-	if (!llc_print(p, length, caplen, NULL, NULL,
-	    &extracted_ethertype)) {
-		/* ether_type not known, print raw packet */
-		if (extracted_ethertype) {
-			printf("(LLC %s) ",
-		etherproto_string(htons(extracted_ethertype)));
-		}
-		if (!suppress_default_print)
-			default_print(p, caplen);
-	}
-}
-
-/*
- * Given a SAP value, generate the LLC header value for a UI packet
- * with that SAP as the source and destination SAP.
- */
-#define LLC_UI_HDR(sap)	((sap)<<16 | (sap<<8) | 0x03)
-
-/*
- * This is the top level routine of the printer.  'p' points
- * to the LLC/SNAP header of the packet, 'h->ts' is the timestamp,
- * 'h->len' is the length of the packet off the wire, and 'h->caplen'
- * is the number of bytes actually captured.
- */
-u_int
-atm_if_print(const struct pcap_pkthdr *h, const u_char *p)
-{
-	u_int caplen = h->caplen;
-	u_int length = h->len;
-	u_int32_t llchdr;
-	u_int hdrlen = 0;
-
-	if (caplen < 8) {
-		printf("[|atm]");
-		return (caplen);
-	}
-
-        /* Cisco Style NLPID ? */
-        if (*p == LLC_UI) {
-            if (eflag)
-                printf("CNLPID ");
-            isoclns_print(p+1, length-1, caplen-1);
-            return hdrlen;
-        }
-
-	/*
-	 * Extract the presumed LLC header into a variable, for quick
-	 * testing.
-	 * Then check for a header that's neither a header for a SNAP
-	 * packet nor an RFC 2684 routed NLPID-formatted PDU nor
-	 * an 802.2-but-no-SNAP IP packet.
-	 */
-	llchdr = EXTRACT_24BITS(p);
-	if (llchdr != LLC_UI_HDR(LLCSAP_SNAP) &&
-	    llchdr != LLC_UI_HDR(LLCSAP_ISONS) &&
-	    llchdr != LLC_UI_HDR(LLCSAP_IP)) {
-		/*
-		 * XXX - assume 802.6 MAC header from Fore driver.
-		 *
-		 * Unfortunately, the above list doesn't check for
-		 * all known SAPs, doesn't check for headers where
-		 * the source and destination SAP aren't the same,
-		 * and doesn't check for non-UI frames.  It also
-		 * runs the risk of an 802.6 MAC header that happens
-		 * to begin with one of those values being
-		 * incorrectly treated as an 802.2 header.
-		 *
-		 * So is that Fore driver still around?  And, if so,
-		 * is it still putting 802.6 MAC headers on ATM
-		 * packets?  If so, could it be changed to use a
-		 * new DLT_IEEE802_6 value if we added it?
-		 */
-		if (eflag)
-			printf("%08x%08x %08x%08x ",
-			       EXTRACT_32BITS(p),
-			       EXTRACT_32BITS(p+4),
-			       EXTRACT_32BITS(p+8),
-			       EXTRACT_32BITS(p+12));
-		p += 20;
-		length -= 20;
-		caplen -= 20;
-		hdrlen += 20;
-	}
-	atm_llc_print(p, length, caplen);
-	return (hdrlen);
-}
-
-/*
- * ATM signalling.
- */
-static struct tok msgtype2str[] = {
-	{ CALL_PROCEED,		"Call_proceeding" },
-	{ CONNECT,		"Connect" },
-	{ CONNECT_ACK,		"Connect_ack" },
-	{ SETUP,		"Setup" },
-	{ RELEASE,		"Release" },
-	{ RELEASE_DONE,		"Release_complete" },
-	{ RESTART,		"Restart" },
-	{ RESTART_ACK,		"Restart_ack" },
-	{ STATUS,		"Status" },
-	{ STATUS_ENQ,		"Status_enquiry" },
-	{ ADD_PARTY,		"Add_party" },
-	{ ADD_PARTY_ACK,	"Add_party_ack" },
-	{ ADD_PARTY_REJ,	"Add_party_reject" },
-	{ DROP_PARTY,		"Drop_party" },
-	{ DROP_PARTY_ACK,	"Drop_party_ack" },
-	{ 0,			NULL }
-};
-
-static void
-sig_print(const u_char *p, int caplen)
-{
-	bpf_u_int32 call_ref;
-
-	if (caplen < PROTO_POS) {
-		printf("[|atm]");
-		return;
-	}
-	if (p[PROTO_POS] == Q2931) {
-		/*
-		 * protocol:Q.2931 for User to Network Interface 
-		 * (UNI 3.1) signalling
-		 */
-		printf("Q.2931");
-		if (caplen < MSG_TYPE_POS) {
-			printf(" [|atm]");
-			return;
-		}
-		printf(":%s ",
-		    tok2str(msgtype2str, "msgtype#%d", p[MSG_TYPE_POS]));
-
-		if (caplen < CALL_REF_POS+3) {
-			printf("[|atm]");
-			return;
-		}
-		call_ref = EXTRACT_24BITS(&p[CALL_REF_POS]);
-		printf("CALL_REF:0x%06x", call_ref);
-	} else {
-		/* SCCOP with some unknown protocol atop it */
-		printf("SSCOP, proto %d ", p[PROTO_POS]);
-	}
-}
-
-/*
- * Print an ATM PDU (such as an AAL5 PDU).
- */
-void
-atm_print(u_int vpi, u_int vci, u_int traftype, const u_char *p, u_int length,
-    u_int caplen)
-{
-	if (eflag)
-		printf("VPI:%u VCI:%u ", vpi, vci);
-
-	if (vpi == 0) {
-		switch (vci) {
-
-		case PPC:
-			sig_print(p, caplen);
-			return;
-
-		case BCC:
-			printf("broadcast sig: ");
-			return;
-
-		case OAMF4SC: /* fall through */
-		case OAMF4EC:
-                        oam_print(p, length, ATM_OAM_HEC);
-			return;
-
-		case METAC:
-			printf("meta: ");
-			return;
-
-		case ILMIC:
-			printf("ilmi: ");
-			snmp_print(p, length);
-			return;
-		}
-	}
-
-	switch (traftype) {
-
-	case ATM_LLC:
-	default:
-		/*
-		 * Assumes traffic is LLC if unknown.
-		 */
-		atm_llc_print(p, length, caplen);
-		break;
-
-	case ATM_LANE:
-		lane_print(p, length, caplen);
-		break;
-	}
-}
-
-int 
-oam_print (const u_char *p, u_int length, u_int hec) {
-
-    u_int32_t cell_header;
-    u_int16_t cell_type, func_type,vpi,vci,payload,clp;
-
-    cell_header = EXTRACT_32BITS(p+hec);
-    cell_type = ((*(p+4+hec))>>4) & 0x0f;
-    func_type = *(p+4+hec) & 0x0f;
-
-    vpi = (cell_header>>20)&0xff;
-    vci = (cell_header>>4)&0xffff;
-    payload = (cell_header>>1)&0x7;
-    clp = cell_header&0x1;
-
-    printf("%s, vpi %u, vci %u, payload %u, clp %u, ",
-           tok2str(oam_f_values, "OAM F5", vci),
-           vpi, vci, payload, clp);
-
-    printf("cell-type %s (%u)",
-           tok2str(oam_celltype_values, "unknown", cell_type),
-           cell_type);
-
-    if (oam_functype_values[cell_type] == NULL)
-        printf(", func-type unknown (%u)", func_type);
-    else
-        printf(", func-type %s (%u)",
-               bittok2str(oam_functype_values[cell_type],"none",func_type),
-               func_type);
-
-    printf(", length %u",length);
-    return 1;
-}