X-Git-Url: https://git.tcpdump.org/tcpdump/blobdiff_plain/ed6a7d8f2deb14d4ed3828f84779838fe9875f02..0b94dfec4bbc08e7bb1c1c6a187bd9c5ec38c8b6:/tcpdump.c

diff --git a/tcpdump.c b/tcpdump.c
index 49029b89..68cbc719 100644
--- a/tcpdump.c
+++ b/tcpdump.c
@@ -1011,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;
@@ -1541,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.