use existing PGM decoder for UDP-encapsulated PGM

[tcpdump] / tcpdump.c

diff --git a/tcpdump.c b/tcpdump.c
index bca67f1e41a10c442ff5f6fb144fe073563f4ec0..a32701cf459d46cf9afa7392d815c6c1f7211dc2 100644 (file)
--- a/tcpdump.c
+++ b/tcpdump.c
@@ -719,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
@@ -1009,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;
@@ -1141,6 +1149,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
@@ -1186,14 +1203,21 @@ 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
-               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)
+               /*
+                * 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);
                }
                else
@@ -1482,6 +1506,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",
@@ -1518,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.