Merge pull request #46 from fxlb/master

[tcpdump] / tcpdump.c

diff --git a/tcpdump.c b/tcpdump.c
index 59aae52764ac6750def856e052e381c041d6199f..49029b8988ab6486fdf4627fc41fe356673dd0a5 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,7 +632,9 @@ static int tcpdump_printf(netdissect_options *ndo _U_,
   return ret;
 }
 
   return ret;
 }
 

-struct print_info get_print_info(int type) {
+static struct print_info
+get_print_info(int type)
+{

        struct print_info printinfo;
 
        printinfo.ndo_type = 1;
        struct print_info printinfo;
 
        printinfo.ndo_type = 1;


@@ -651,10 +655,12 @@ struct print_info get_print_info(int type) {
        return (printinfo);
 }
 
        return (printinfo);
 }
 

-char *get_next_file(FILE *VFile, char *ptr) {
+static char *
+get_next_file(FILE *VFile, char *ptr)
+{

        char *ret;
 
        char *ret;
 

-       ret = fgets(ptr, NAME_MAX, VFile);
+       ret = fgets(ptr, PATH_MAX, VFile);

        if (!ret)
                return NULL;
 
        if (!ret)
                return NULL;
 


@@ -683,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;


@@ -712,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


@@ -842,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");
 


@@ -961,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)


@@ -971,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;


@@ -1136,6 +1143,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


@@ -1181,12 +1197,19 @@ 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

+               /*
+                * 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);
                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);


@@ -1410,8 +1433,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");


@@ -1477,6 +1500,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",


@@ -1759,7 +1787,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");
                        /*


@@ -1811,7 +1839,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);