X-Git-Url: https://git.tcpdump.org/tcpdump/blobdiff_plain/70bc9330d1b3fd6cd1fbd324ae222cd3fd39fcce..e2f07d68a62a30a8023d4dea2d50428bd3eabf7e:/tcpdump.c

diff --git a/tcpdump.c b/tcpdump.c
index 44032842..008896e3 100644
--- a/tcpdump.c
+++ b/tcpdump.c
@@ -30,7 +30,7 @@ static const char copyright[] _U_ =
     "@(#) 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[] _U_ =
-    "@(#) $Header: /tcpdump/master/tcpdump/tcpdump.c,v 1.242 2004-04-07 08:14:10 guy Exp $ (LBL)";
+    "@(#) $Header: /tcpdump/master/tcpdump/tcpdump.c,v 1.253.2.1 2005-04-20 12:45:06 hannes Exp $ (LBL)";
 #endif
 
 /*
@@ -90,7 +90,8 @@ netdissect_options *gndo = &Gndo;
 #define MAX_CFLAG	1000000
 #define MAX_CFLAG_CHARS	6
 
-int Lflag;          /* list available data link types and exit */
+int dflag;			/* print filter code */
+int Lflag;			/* list available data link types and exit */
 
 static int infodelay;
 static int infoprint;
@@ -105,6 +106,7 @@ static void usage(void) __attribute__((noreturn));
 static void show_dlts_and_exit(pcap_t *pd) __attribute__((noreturn));
 
 static void print_packet(u_char *, const struct pcap_pkthdr *, const u_char *);
+static void ndo_default_print(netdissect_options *, const u_char *, u_int);
 static void dump_packet_and_trunc(u_char *, const struct pcap_pkthdr *, const u_char *);
 static void dump_packet(u_char *, const struct pcap_pkthdr *, const u_char *);
 static void droproot(const char *, const char *);
@@ -154,6 +156,9 @@ static struct printer printers[] = {
 	{ sl_bsdos_if_print,	DLT_SLIP_BSDOS },
 #endif
 	{ ppp_if_print,		DLT_PPP },
+#ifdef DLT_PPP_WITHDIRECTION
+	{ ppp_if_print,		DLT_PPP_WITHDIRECTION },
+#endif
 #ifdef DLT_PPP_BSDOS
 	{ ppp_bsdos_if_print,	DLT_PPP_BSDOS },
 #endif
@@ -214,6 +219,21 @@ static struct printer printers[] = {
 #endif
 #ifdef DLT_APPLE_IP_OVER_IEEE1394
 	{ ap1394_if_print,	DLT_APPLE_IP_OVER_IEEE1394 },
+#endif
+#ifdef DLT_JUNIPER_ATM1
+	{ juniper_atm1_print,	DLT_JUNIPER_ATM1 },
+#endif
+#ifdef DLT_JUNIPER_ATM2
+	{ juniper_atm2_print,	DLT_JUNIPER_ATM2 },
+#endif
+#ifdef DLT_JUNIPER_MFR
+	{ juniper_mfr_print,	DLT_JUNIPER_MFR },
+#endif
+#ifdef DLT_JUNIPER_MLFR
+	{ juniper_mlfr_print,	DLT_JUNIPER_MLFR },
+#endif
+#ifdef DLT_JUNIPER_MLPPP
+	{ juniper_mlppp_print,	DLT_JUNIPER_MLPPP },
 #endif
 	{ NULL,			0 },
 };
@@ -388,7 +408,7 @@ static int tcpdump_printf(netdissect_options *ndo _U_,
   va_end(args);
 
   return ret;
-};
+}
 
 int
 main(int argc, char **argv)
@@ -420,8 +440,8 @@ main(int argc, char **argv)
 
         gndo->ndo_Oflag=1;
 	gndo->ndo_Rflag=1;
-	gndo->ndo_tflag=1;
 	gndo->ndo_dlt=-1;
+	gndo->ndo_default_print=ndo_default_print;
 	gndo->ndo_printf=tcpdump_printf;
 	gndo->ndo_error=ndo_error;
 	gndo->ndo_warning=ndo_warning;
@@ -644,7 +664,7 @@ main(int argc, char **argv)
 			break;
 
 		case 't':
-			--tflag;
+			++tflag;
 			break;
 
 		case 'T':
@@ -700,7 +720,6 @@ main(int argc, char **argv)
 			break;
 
 		case 'X':
-		        ++xflag;
 			++Xflag;
 			break;
 
@@ -741,8 +760,22 @@ main(int argc, char **argv)
 			/* NOTREACHED */
 		}
 
-	if (tflag > 0)
+	switch (tflag) {
+
+	case 0: /* Default */
+	case 4: /* Default + Date*/
 		thiszone = gmt2local(0);
+		break;
+
+	case 1: /* No time stamp */
+	case 2: /* Unix timeval style */
+	case 3: /* Microseconds since previous packet */
+		break;
+
+	default: /* Not supported */
+		error("only -t, -tt, -ttt, and -tttt are supported");
+		break;
+	}
 
 #ifdef WITH_CHROOT
 	/* if run as root, prepare for chrooting */
@@ -1181,7 +1214,7 @@ print_packet(u_char *user, const struct pcap_pkthdr *h, const u_char *sp)
 			/*
 			 * Include the link-layer header.
 			 */
-			default_print(sp, h->caplen);
+			hex_print("\n\t", sp, h->caplen);
 		} else {
 			/*
 			 * Don't include the link-layer header - and if
@@ -1189,7 +1222,26 @@ print_packet(u_char *user, const struct pcap_pkthdr *h, const u_char *sp)
 			 * print nothing.
 			 */
 			if (h->caplen > hdrlen)
-				default_print(sp + hdrlen,
+				hex_print("\n\t", sp + hdrlen,
+				    h->caplen - hdrlen);
+		}
+       } else if (Xflag) {
+		/*
+		 * Print the raw packet data.
+		 */
+		if (Xflag > 1) {
+			/*
+			 * Include the link-layer header.
+			 */
+			ascii_print("\n\t", sp, h->caplen);
+		} else {
+			/*
+			 * Don't include the link-layer header - and if
+			 * we have nothing past the link-layer header,
+			 * print nothing.
+			 */
+			if (h->caplen > hdrlen)
+				ascii_print("\n\t", sp + hdrlen,
 				    h->caplen - hdrlen);
 		}
 	}
@@ -1231,10 +1283,16 @@ print_packet(u_char *user, const struct pcap_pkthdr *h, const u_char *sp)
 /*
  * By default, print the specified data out in hex.
  */
+static void
+ndo_default_print(netdissect_options *ndo _U_, const u_char *bp, u_int length)
+{
+	ascii_print("\n\t", bp, length); /* pass on lf and identation string */
+}
+
 void
-default_print(register const u_char *bp, register u_int length)
+default_print(const u_char *bp, u_int length)
 {
-    ascii_print("\n\t", bp, length); /* pass on lf and identation string */
+	ndo_default_print(gndo, bp, length);
 }
 
 #ifdef SIGINFO
@@ -1303,9 +1361,9 @@ usage(void)
 	(void)fprintf(stderr,
 "\t\t[ -E algo:secret ] [ -F file ] [ -i interface ] [ -M secret ]\n");
 	(void)fprintf(stderr,
-"\t\t[ -r file ] [ -s snaplen ] [ -T type ] [ -w file ] [ -W filecount ]\n");
+"\t\t[ -r file ] [ -s snaplen ] [ -T type ] [ -w file ]\n");
 	(void)fprintf(stderr,
-"\t\t[ -y datalinktype ] [ -Z user ]\n");
+"\t\t[ -W filecount ] [ -y datalinktype ] [ -Z user ]\n");
 	(void)fprintf(stderr,
 "\t\t[ expression ]\n");
 	exit(1);
@@ -1314,7 +1372,7 @@ usage(void)
 
 
 /* VARARGS */
-void
+static void
 ndo_error(netdissect_options *ndo _U_, const char *fmt, ...)
 {
 	va_list ap;
@@ -1333,7 +1391,7 @@ ndo_error(netdissect_options *ndo _U_, const char *fmt, ...)
 }
 
 /* VARARGS */
-void
+static void
 ndo_warning(netdissect_options *ndo _U_, const char *fmt, ...)
 {
 	va_list ap;