fix two printf format strings

[tcpdump] / tcpdump.c

diff --git a/tcpdump.c b/tcpdump.c
index 5f3bde5661cfe32993a630a1a8dccffafda6379a..a4e8bf5a0e29a241372ab91c204bc6cab5600347 100644 (file)
--- a/tcpdump.c
+++ b/tcpdump.c
@@ -87,8 +87,8 @@ extern int SIZE_BUF;
 #include "gmt2local.h"
 #include "pcap-missing.h"
 
 #include "gmt2local.h"
 #include "pcap-missing.h"
 

-#ifndef NAME_MAX
-#define NAME_MAX 255
+#ifndef PATH_MAX
+#define PATH_MAX 1024

 #endif
 
 #ifdef SIGINFO
 #endif
 
 #ifdef SIGINFO


@@ -588,7 +588,9 @@ getWflagChars(int x)
 static void
 MakeFilename(char *buffer, char *orig_name, int cnt, int max_chars)
 {
 static void
 MakeFilename(char *buffer, char *orig_name, int cnt, int max_chars)
 {

-        char *filename = malloc(NAME_MAX + 1);
+        char *filename = malloc(PATH_MAX + 1);
+        if (filename == NULL)
+            error("Makefilename: malloc");

 
         /* Process with strftime if Gflag is set. */
         if (Gflag != 0) {
 
         /* Process with strftime if Gflag is set. */
         if (Gflag != 0) {


@@ -602,17 +604,17 @@ MakeFilename(char *buffer, char *orig_name, int cnt, int max_chars)
           /* There's no good way to detect an error in strftime since a return
            * value of 0 isn't necessarily failure.
            */
           /* There's no good way to detect an error in strftime since a return
            * value of 0 isn't necessarily failure.
            */

-          strftime(filename, NAME_MAX, orig_name, local_tm);
+          strftime(filename, PATH_MAX, orig_name, local_tm);

         } else {
         } else {

-          strncpy(filename, orig_name, NAME_MAX);
+          strncpy(filename, orig_name, PATH_MAX);

         }
 
        if (cnt == 0 && max_chars == 0)
         }
 
        if (cnt == 0 && max_chars == 0)

-               strncpy(buffer, filename, NAME_MAX + 1);
+               strncpy(buffer, filename, PATH_MAX + 1);

        else
        else

-               if (snprintf(buffer, NAME_MAX + 1, "%s%0*d", filename, max_chars, cnt) > NAME_MAX)
+               if (snprintf(buffer, PATH_MAX + 1, "%s%0*d", filename, max_chars, cnt) > PATH_MAX)

                   /* Report an error if the filename is too large */
                   /* Report an error if the filename is too large */

-                  error("too many output files or filename is too long (> %d)", NAME_MAX);
+                  error("too many output files or filename is too long (> %d)", PATH_MAX);

         free(filename);
 }
 
         free(filename);
 }
 


@@ -630,6 +632,44 @@ static int tcpdump_printf(netdissect_options *ndo _U_,
   return ret;
 }
 
   return ret;
 }
 

+static struct print_info
+get_print_info(int type)
+{
+       struct print_info printinfo;
+
+       printinfo.ndo_type = 1;
+       printinfo.ndo = gndo;
+       printinfo.p.ndo_printer = lookup_ndo_printer(type);
+       if (printinfo.p.ndo_printer == NULL) {
+               printinfo.p.printer = lookup_printer(type);
+               printinfo.ndo_type = 0;
+               if (printinfo.p.printer == NULL) {
+                       gndo->ndo_dltname = pcap_datalink_val_to_name(type);
+                       if (gndo->ndo_dltname != NULL)
+                               error("packet printing is not supported for link type %s: use -w",
+                                     gndo->ndo_dltname);
+                       else
+                               error("packet printing is not supported for link type %d: use -w", type);
+               }
+       }
+       return (printinfo);
+}
+
+static char *
+get_next_file(FILE *VFile, char *ptr)
+{
+       char *ret;
+
+       ret = fgets(ptr, PATH_MAX, VFile);
+       if (!ret)
+               return NULL;
+
+       if (ptr[strlen(ptr) - 1] == '\n')
+               ptr[strlen(ptr) - 1] = '\0';
+
+       return ret;
+}
+

 int
 main(int argc, char **argv)
 {
 int
 main(int argc, char **argv)
 {


@@ -639,6 +679,7 @@ main(int argc, char **argv)
        pcap_handler callback;
        int type;
        int dlt;
        pcap_handler callback;
        int type;
        int dlt;

+       int new_dlt;

        const char *dlt_name;
        struct bpf_program fcode;
 #ifndef WIN32
        const char *dlt_name;
        struct bpf_program fcode;
 #ifndef WIN32


@@ -648,10 +689,11 @@ main(int argc, char **argv)
        struct dump_info dumpinfo;
        u_char *pcap_userdata;
        char ebuf[PCAP_ERRBUF_SIZE];
        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;
        char *username = NULL;
        char *chroot_dir = NULL;
        char *ret = NULL;

+       char *end;

 #ifdef HAVE_PCAP_FINDALLDEVS
        pcap_if_t *devpointer;
        int devnum;
 #ifdef HAVE_PCAP_FINDALLDEVS
        pcap_if_t *devpointer;
        int devnum;


@@ -677,7 +719,9 @@ main(int argc, char **argv)
        infile = NULL;
        RFileName = NULL;
        VFileName = NULL;
        infile = NULL;
        RFileName = NULL;
        VFileName = NULL;

+       VFile = NULL;

        WFileName = NULL;
        WFileName = NULL;

+       dlt = -1;

        if ((cp = strrchr(argv[0], '/')) != NULL)
                program_name = cp + 1;
        else
        if ((cp = strrchr(argv[0], '/')) != NULL)
                program_name = cp + 1;
        else


@@ -807,7 +851,8 @@ main(int argc, char **argv)
                         * It can be useful on Windows, where more than
                         * one interface can have the same name.
                         */
                         * It can be useful on Windows, where more than
                         * one interface can have the same name.
                         */

-                       if ((devnum = atoi(optarg)) != 0) {
+                       devnum = strtol(optarg, &end, 10);
+                       if (optarg != end && *end == '\0') {

                                if (devnum < 0)
                                        error("Invalid adapter index");
 
                                if (devnum < 0)
                                        error("Invalid adapter index");
 


@@ -926,9 +971,7 @@ main(int argc, char **argv)
                        Rflag = 0;
                        break;
 
                        Rflag = 0;
                        break;
 

-               case 's': {
-                       char *end;
-
+               case 's':

                        snaplen = strtol(optarg, &end, 0);
                        if (optarg == end || *end != '\0'
                            || snaplen < 0 || snaplen > MAXIMUM_SNAPLEN)
                        snaplen = strtol(optarg, &end, 0);
                        if (optarg == end || *end != '\0'
                            || snaplen < 0 || snaplen > MAXIMUM_SNAPLEN)


@@ -936,7 +979,6 @@ main(int argc, char **argv)
                        else if (snaplen == 0)
                                snaplen = MAXIMUM_SNAPLEN;
                        break;
                        else if (snaplen == 0)
                                snaplen = MAXIMUM_SNAPLEN;
                        break;

-               }

 
                case 'S':
                        ++Sflag;
 
                case 'S':
                        ++Sflag;


@@ -969,6 +1011,10 @@ main(int argc, char **argv)
                                packettype = PT_CARP;
                        else if (strcasecmp(optarg, "radius") == 0)
                                packettype = PT_RADIUS;
                                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;
                        else
                                error("unknown packet type `%s'", optarg);
                        break;


@@ -1101,6 +1147,15 @@ main(int argc, char **argv)
 #endif
 
        if (RFileName != NULL || VFileName != NULL) {
 #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
 #ifndef WIN32
                /*
                 * We don't need network access, so relinquish any set-UID


@@ -1116,19 +1171,16 @@ main(int argc, char **argv)
 #endif /* WIN32 */
                if (VFileName != NULL) {
                        if (VFileName[0] == '-' && VFileName[1] == '\0')
 #endif /* WIN32 */
                if (VFileName != NULL) {
                        if (VFileName[0] == '-' && VFileName[1] == '\0')

-                               VFile = fopen("/dev/stdin", "r");
+                               VFile = stdin;

                        else
                                VFile = fopen(VFileName, "r");
 
                        if (VFile == NULL)
                                error("Unable to open file: %s\n", strerror(errno));
 
                        else
                                VFile = fopen(VFileName, "r");
 
                        if (VFile == NULL)
                                error("Unable to open file: %s\n", strerror(errno));
 

-                       ret = fgets(VFileLine, NAME_MAX, VFile);
+                       ret = get_next_file(VFile, VFileLine);

                        if (!ret)
                        if (!ret)

-                               error("Nothing in %s\n", VFile);
-
-                       if (VFileLine[strlen(VFileLine) - 1] == '\n')
-                               VFileLine[strlen(VFileLine) - 1] = '\0';
+                               error("Nothing in %s\n", VFileName);

                        RFileName = VFileLine;
                }
 
                        RFileName = VFileLine;
                }
 


@@ -1149,14 +1201,21 @@ main(int argc, char **argv)
                localnet = 0;
                netmask = 0;
        } else {
                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 (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
                        fprintf(stderr, "%s: listening on %ws\n", program_name, device);
                }
                else


@@ -1378,8 +1437,8 @@ main(int argc, char **argv)
                error("%s", pcap_geterr(pd));
        if (WFileName) {
                pcap_dumper_t *p;
                error("%s", pcap_geterr(pd));
        if (WFileName) {
                pcap_dumper_t *p;

-               /* Do not exceed the default NAME_MAX for files. */
-               dumpinfo.CurrentFileName = (char *)malloc(NAME_MAX + 1);
+               /* Do not exceed the default PATH_MAX for files. */
+               dumpinfo.CurrentFileName = (char *)malloc(PATH_MAX + 1);

 
                if (dumpinfo.CurrentFileName == NULL)
                        error("malloc of dumpinfo.CurrentFileName");
 
                if (dumpinfo.CurrentFileName == NULL)
                        error("malloc of dumpinfo.CurrentFileName");


@@ -1413,21 +1472,7 @@ main(int argc, char **argv)
 #endif
        } else {
                type = pcap_datalink(pd);
 #endif
        } else {
                type = pcap_datalink(pd);

-                printinfo.ndo_type = 1;
-                printinfo.ndo = gndo;
-               printinfo.p.ndo_printer = lookup_ndo_printer(type);
-                if (printinfo.p.ndo_printer == NULL) {
-                        printinfo.p.printer = lookup_printer(type);
-                        printinfo.ndo_type = 0;
-                        if (printinfo.p.printer == NULL) {
-                                gndo->ndo_dltname = pcap_datalink_val_to_name(type);
-                                if (gndo->ndo_dltname != NULL)
-                                        error("packet printing is not supported for link type %s: use -w",
-                                              gndo->ndo_dltname);
-                                else
-                                        error("packet printing is not supported for link type %d: use -w", type);
-                        }
-                }
+               printinfo = get_print_info(type);

                callback = print_packet;
                pcap_userdata = (u_char *)&printinfo;
        }
                callback = print_packet;
                pcap_userdata = (u_char *)&printinfo;
        }


@@ -1459,6 +1504,11 @@ main(int argc, char **argv)
 
 #ifndef WIN32
        if (RFileName == NULL) {
 
 #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",
                if (!vflag && !WFileName) {
                        (void)fprintf(stderr,
                            "%s: verbose output suppressed, use -v or -vv for full protocol decode\n",


@@ -1495,6 +1545,14 @@ main(int argc, char **argv)
                        }
                        (void)fflush(stdout);
                }
                        }
                        (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.
                if (status == -1) {
                        /*
                         * Error.  Report it.


@@ -1511,24 +1569,25 @@ main(int argc, char **argv)
                }
                pcap_close(pd);
                if (VFileName != NULL) {
                }
                pcap_close(pd);
                if (VFileName != NULL) {

-                       ret = fgets(VFileLine, NAME_MAX, VFile);
+                       ret = get_next_file(VFile, VFileLine);

                        if (ret) {
                        if (ret) {

-                               if (VFileLine[strlen(VFileLine) - 1] == '\n')
-                                       VFileLine[strlen(VFileLine) - 1] = '\0';

                                RFileName = VFileLine;
                                pd = pcap_open_offline(RFileName, ebuf);
                                if (pd == NULL)
                                        error("%s", ebuf);
                                RFileName = VFileLine;
                                pd = pcap_open_offline(RFileName, ebuf);
                                if (pd == NULL)
                                        error("%s", ebuf);

-                               dlt = pcap_datalink(pd);
-                               dlt_name = pcap_datalink_val_to_name(dlt);
+                               new_dlt = pcap_datalink(pd);
+                               if (WFileName && new_dlt != dlt)
+                                       error("%s: new dlt does not match original", RFileName);
+                               printinfo = get_print_info(new_dlt);
+                               dlt_name = pcap_datalink_val_to_name(new_dlt);

                                if (dlt_name == NULL) {
                                        fprintf(stderr, "reading from file %s, link-type %u\n",
                                if (dlt_name == NULL) {
                                        fprintf(stderr, "reading from file %s, link-type %u\n",

-                                       RFileName, dlt);
+                                       RFileName, new_dlt);

                                } else {
                                        fprintf(stderr,
                                        "reading from file %s, link-type %s (%s)\n",
                                        RFileName, dlt_name,
                                } else {
                                        fprintf(stderr,
                                        "reading from file %s, link-type %s (%s)\n",
                                        RFileName, dlt_name,

-                                       pcap_datalink_val_to_description(dlt));
+                                       pcap_datalink_val_to_description(new_dlt));

                                }
                                if (pcap_compile(pd, &fcode, cmdbuf, Oflag, netmask) < 0)
                                        error("%s", pcap_geterr(pd));
                                }
                                if (pcap_compile(pd, &fcode, cmdbuf, Oflag, netmask) < 0)
                                        error("%s", pcap_geterr(pd));


@@ -1740,7 +1799,7 @@ dump_packet_and_trunc(u_char *user, const struct pcap_pkthdr *h, const u_char *s
                        if (dump_info->CurrentFileName != NULL)
                                free(dump_info->CurrentFileName);
                        /* Allocate space for max filename + \0. */
                        if (dump_info->CurrentFileName != NULL)
                                free(dump_info->CurrentFileName);
                        /* Allocate space for max filename + \0. */

-                       dump_info->CurrentFileName = (char *)malloc(NAME_MAX + 1);
+                       dump_info->CurrentFileName = (char *)malloc(PATH_MAX + 1);

                        if (dump_info->CurrentFileName == NULL)
                                error("dump_packet_and_trunc: malloc");
                        /*
                        if (dump_info->CurrentFileName == NULL)
                                error("dump_packet_and_trunc: malloc");
                        /*


@@ -1792,7 +1851,7 @@ dump_packet_and_trunc(u_char *user, const struct pcap_pkthdr *h, const u_char *s
                }
                if (dump_info->CurrentFileName != NULL)
                        free(dump_info->CurrentFileName);
                }
                if (dump_info->CurrentFileName != NULL)
                        free(dump_info->CurrentFileName);

-               dump_info->CurrentFileName = (char *)malloc(NAME_MAX + 1);
+               dump_info->CurrentFileName = (char *)malloc(PATH_MAX + 1);

                if (dump_info->CurrentFileName == NULL)
                        error("dump_packet_and_trunc: malloc");
                MakeFilename(dump_info->CurrentFileName, dump_info->WFileName, Cflag_count, WflagChars);
                if (dump_info->CurrentFileName == NULL)
                        error("dump_packet_and_trunc: malloc");
                MakeFilename(dump_info->CurrentFileName, dump_info->WFileName, Cflag_count, WflagChars);