X-Git-Url: https://git.tcpdump.org/tcpdump/blobdiff_plain/87b0154b8a2d621c04f12fba3bf1843297de5d7c..318ecd24c592f77ddf5905a0717bf3eada02b765:/tcpdump.c

diff --git a/tcpdump.c b/tcpdump.c
index e47b95f2..68cbc719 100644
--- a/tcpdump.c
+++ b/tcpdump.c
@@ -632,7 +632,9 @@ static int tcpdump_printf(netdissect_options *ndo _U_,
   return ret;
 }
 
-struct print_info get_print_info(int type) {
+static struct print_info
+get_print_info(int type)
+{
 	struct print_info printinfo;
 
 	printinfo.ndo_type = 1;
@@ -653,10 +655,12 @@ struct print_info get_print_info(int type) {
 	return (printinfo);
 }
 
-char *get_next_file(FILE *VFile, char *ptr) {
+static char *
+get_next_file(FILE *VFile, char *ptr)
+{
 	char *ret;
 
-	ret = fgets(ptr, NAME_MAX, VFile);
+	ret = fgets(ptr, PATH_MAX, VFile);
 	if (!ret)
 		return NULL;
 
@@ -685,7 +689,7 @@ main(int argc, char **argv)
 	struct dump_info dumpinfo;
 	u_char *pcap_userdata;
 	char ebuf[PCAP_ERRBUF_SIZE];
-	char VFileLine[NAME_MAX + 1];
+	char VFileLine[PATH_MAX + 1];
 	char *username = NULL;
 	char *chroot_dir = NULL;
 	char *ret = NULL;
@@ -715,7 +719,9 @@ main(int argc, char **argv)
 	infile = NULL;
 	RFileName = NULL;
 	VFileName = NULL;
+	VFile = NULL;
 	WFileName = NULL;
+	dlt = -1;
 	if ((cp = strrchr(argv[0], '/')) != NULL)
 		program_name = cp + 1;
 	else
@@ -1005,6 +1011,10 @@ main(int argc, char **argv)
 				packettype = PT_CARP;
 			else if (strcasecmp(optarg, "radius") == 0)
 				packettype = PT_RADIUS;
+			else if (strcasecmp(optarg, "zmtp1") == 0)
+				packettype = PT_ZMTP1;
+			else if (strcasecmp(optarg, "vxlan") == 0)
+				packettype = PT_VXLAN;
 			else
 				error("unknown packet type `%s'", optarg);
 			break;
@@ -1137,6 +1147,15 @@ main(int argc, char **argv)
 #endif
 
 	if (RFileName != NULL || VFileName != NULL) {
+		/*
+		 * If RFileName is non-null, it's the pathname of a
+		 * savefile to read.  If VFileName is non-null, it's
+		 * the pathname of a file containing a list of pathnames
+		 * (one per line) of savefiles to read.
+		 *
+		 * In either case, we're reading a savefile, not doing
+		 * a live capture.
+		 */
 #ifndef WIN32
 		/*
 		 * We don't need network access, so relinquish any set-UID
@@ -1182,12 +1201,19 @@ main(int argc, char **argv)
 		localnet = 0;
 		netmask = 0;
 	} else {
+		/*
+		 * We're doing a live capture.
+		 */
 		if (device == NULL) {
 			device = pcap_lookupdev(ebuf);
 			if (device == NULL)
 				error("%s", ebuf);
 		}
 #ifdef WIN32
+		/*
+		 * Print a message to the standard error on Windows.
+		 * XXX - why do it here, with a different message?
+		 */
 		if(strlen(device) == 1)	//we assume that an ASCII string is always longer than 1 char
 		{						//a Unicode string has a \0 as second byte (so strlen() is 1)
 			fprintf(stderr, "%s: listening on %ws\n", program_name, device);
@@ -1478,6 +1504,11 @@ main(int argc, char **argv)
 
 #ifndef WIN32
 	if (RFileName == NULL) {
+		/*
+		 * Live capture (if -V was specified, we set RFileName
+		 * to a file from the -V file).  Print a message to
+		 * the standard error on UN*X.
+		 */
 		if (!vflag && !WFileName) {
 			(void)fprintf(stderr,
 			    "%s: verbose output suppressed, use -v or -vv for full protocol decode\n",
@@ -1514,6 +1545,14 @@ main(int argc, char **argv)
 			}
 			(void)fflush(stdout);
 		}
+                if (status == -2) {
+			/*
+			 * We got interrupted. If we are reading multiple
+			 * files (via -V) set these so that we stop.
+			 */
+			VFileName = NULL;
+			ret = NULL;
+		}
 		if (status == -1) {
 			/*
 			 * Error.  Report it.