use macros for VAT and WB port numbers

[tcpdump] / tcpdump.c

diff --git a/tcpdump.c b/tcpdump.c
index 49029b8988ab6486fdf4627fc41fe356673dd0a5..68cbc719c668595f19d358491667cda98d465ccb 100644 (file)
--- 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.