X-Git-Url: https://git.tcpdump.org/tcpdump/blobdiff_plain/2f02a466759ee5f8def904bb3da70e2abcd05b6f..b10f46c2d6e3755598340ba77895e6631953ccc0:/tcpdump.c

diff --git a/tcpdump.c b/tcpdump.c
index 49029b89..a32701cf 100644
--- a/tcpdump.c
+++ b/tcpdump.c
@@ -1011,6 +1011,12 @@ 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 if (strcasecmp(optarg, "pgm") == 0)
+				packettype = PT_PGM;
 			else
 				error("unknown packet type `%s'", optarg);
 			break;
@@ -1210,8 +1216,8 @@ main(int argc, char **argv)
 		 * 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)
+		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);
 		}
 		else
@@ -1541,6 +1547,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.