X-Git-Url: https://git.tcpdump.org/tcpdump/blobdiff_plain/ccaf082ec23c28e10a28870f0ef2e4d48165ac0a..f4d9457518b8aab88e43e5e19e9603e24fb45b74:/tcpdump.c

diff --git a/tcpdump.c b/tcpdump.c
index ef3edc9e..1d81af14 100644
--- a/tcpdump.c
+++ b/tcpdump.c
@@ -30,7 +30,7 @@ static const char copyright[] =
     "@(#) Copyright (c) 1988, 1989, 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1997, 2000\n\
 The Regents of the University of California.  All rights reserved.\n";
 static const char rcsid[] =
-    "@(#) $Header: /tcpdump/master/tcpdump/tcpdump.c,v 1.203 2003-02-11 08:04:18 guy Exp $ (LBL)";
+    "@(#) $Header: /tcpdump/master/tcpdump/tcpdump.c,v 1.208 2003-05-25 16:26:57 hannes Exp $ (LBL)";
 #endif
 
 /*
@@ -147,9 +147,13 @@ static struct printer printers[] = {
 	{ cip_if_print,         DLT_ATM_CLIP },
 #endif
 	{ sl_if_print,		DLT_SLIP },
+#ifdef DLT_SLIP_BSDOS
 	{ sl_bsdos_if_print,	DLT_SLIP_BSDOS },
+#endif
 	{ ppp_if_print,		DLT_PPP },
+#ifdef DLT_PPP_BSDOS
 	{ ppp_bsdos_if_print,	DLT_PPP_BSDOS },
+#endif
 	{ fddi_if_print,	DLT_FDDI },
 	{ null_if_print,	DLT_NULL },
 #ifdef DLT_LOOP
@@ -198,6 +202,9 @@ static struct printer printers[] = {
 #endif
 #ifdef DLT_IEEE802_11_RADIO
 	{ ieee802_11_radio_if_print,	DLT_IEEE802_11_RADIO },
+#endif
+#ifdef DLT_ENC
+	{ enc_if_print, 	DLT_ENC },
 #endif
 	{ NULL,			0 },
 };
@@ -535,6 +542,8 @@ main(int argc, char **argv)
 				packettype = PT_SNMP;
 			else if (strcasecmp(optarg, "cnfp") == 0)
 				packettype = PT_CNFP;
+			else if (strcasecmp(optarg, "tftp") == 0)
+				packettype = PT_TFTP;
 			else
 				error("unknown packet type `%s'", optarg);
 			break;
@@ -609,6 +618,9 @@ main(int argc, char **argv)
 #endif /* WIN32 */
 
 		pd = pcap_open_offline(RFileName, ebuf);
+                printf("reading from file %s, link-type %u\n",
+		       RFileName,
+		       pcap_datalink(pd));
 		if (pd == NULL)
 			error("%s", ebuf);
 		localnet = 0;
@@ -736,8 +748,8 @@ main(int argc, char **argv)
 			    program_name);
 		} else
 			(void)fprintf(stderr, "%s: ", program_name);
-		(void)fprintf(stderr, "listening on %s, capture size %u bytes\n",
-		    device, snaplen);
+		(void)fprintf(stderr, "listening on %s, link-type %u, capture size %u bytes\n",
+		    device, pcap_datalink(pd), snaplen);
 		(void)fflush(stderr);
 	}
 #endif /* WIN32 */