initial checkin

[tcpdump] / tcpdump.c

diff --git a/tcpdump.c b/tcpdump.c
index 5437cee765c18cb1430d1988d3d10c70653935fb..8f2e5e3a7e64f19b1de79991a86d171e1a8bd774 100644 (file)
--- a/tcpdump.c
+++ b/tcpdump.c
@@ -30,7 +30,7 @@ static const char copyright[] =
     "@(#) Copyright (c) 1988, 1989, 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1997, 2000\n\
 The Regents of the University of California.  All rights reserved.\n";
 static const char rcsid[] =
     "@(#) Copyright (c) 1988, 1989, 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1997, 2000\n\
 The Regents of the University of California.  All rights reserved.\n";
 static const char rcsid[] =

-    "@(#) $Header: /tcpdump/master/tcpdump/tcpdump.c,v 1.182 2002-08-03 23:16:57 guy Exp $ (LBL)";
+    "@(#) $Header: /tcpdump/master/tcpdump/tcpdump.c,v 1.186 2002-09-05 21:25:51 guy Exp $ (LBL)";

 #endif
 
 /*
 #endif
 
 /*


@@ -222,7 +222,6 @@ main(int argc, char **argv)
        int devnum;
 #endif
 #ifdef WIN32
        int devnum;
 #endif
 #ifdef WIN32

-       int ii;

        DWORD dwVersion;
        DWORD dwWindowsMajorVersion;
        u_int UserBufferSize=1000000;
        DWORD dwVersion;
        DWORD dwWindowsMajorVersion;
        u_int UserBufferSize=1000000;


@@ -254,12 +253,12 @@ main(int argc, char **argv)
        opterr = 0;
        while (
 #ifdef WIN32
        opterr = 0;
        while (
 #ifdef WIN32

-           (op = getopt(argc, argv, "aB:c:C:dDeE:fF:i:lm:nNOpqr:Rs:StT:uvw:xXY")) != -1)
+           (op = getopt(argc, argv, "aAB:c:C:dDeE:fF:i:lm:nNOpqr:Rs:StT:uvw:xXY")) != -1)

 #else /* WIN32 */
 #ifdef HAVE_PCAP_FINDALLDEVS
 #else /* WIN32 */
 #ifdef HAVE_PCAP_FINDALLDEVS

-           (op = getopt(argc, argv, "ac:C:dDeE:fF:i:lm:nNOpqr:Rs:StT:uvw:xXY")) != -1)
+           (op = getopt(argc, argv, "aAc:C:dDeE:fF:i:lm:nNOpqr:Rs:StT:uvw:xXY")) != -1)

 #else /* HAVE_PCAP_FINDALLDEVS */
 #else /* HAVE_PCAP_FINDALLDEVS */

-           (op = getopt(argc, argv, "ac:C:deE:fF:i:lm:nNOpqr:Rs:StT:uvw:xXY")) != -1)
+           (op = getopt(argc, argv, "aAc:C:deE:fF:i:lm:nNOpqr:Rs:StT:uvw:xXY")) != -1)

 #endif /* HAVE_PCAP_FINDALLDEVS */
 #endif /* WIN32 */
                switch (op) {
 #endif /* HAVE_PCAP_FINDALLDEVS */
 #endif /* WIN32 */
                switch (op) {


@@ -476,12 +475,17 @@ main(int argc, char **argv)
                        ++Xflag;
                        break;
 
                        ++Xflag;
                        break;
 

-#ifdef YYDEBUG
+#if defined(HAVE_PCAP_DEBUG) || defined(HAVE_YYDEBUG)

                case 'Y':
                        {
                        /* Undocumented flag */
                case 'Y':
                        {
                        /* Undocumented flag */

+#ifdef HAVE_PCAP_DEBUG
+                       extern int pcap_debug;
+                       pcap_debug = 1;
+#else

                        extern int yydebug;
                        yydebug = 1;
                        extern int yydebug;
                        yydebug = 1;

+#endif

                        }
                        break;
 #endif
                        }
                        break;
 #endif


@@ -520,21 +524,7 @@ main(int argc, char **argv)
                                error("%s", ebuf);
                }
 #ifdef WIN32
                                error("%s", ebuf);
                }
 #ifdef WIN32

-               else
-               {
-                       if (!(dwVersion >= 0x80000000 && dwWindowsMajorVersion >= 4))                   /* Windows '95 */
-                       {
-                               if(device[1]!=0)
-                                       device=(char*)SChar2WChar(device);
-                       }
-                       else{
-                               for (ii=0;ii<(signed)strlen(device);ii++)
-                               for (ii=strlen(device)-1;ii>0&&(device[ii]==' '||device[ii]=='\t');ii--)device[ii]='\0';
-                               for (ii=0;ii<(signed)strlen(device)&&(device[ii]==' '||device[ii]=='\t');ii++);
-                               strcpy(device,device+ii);
-                       }
-               }
-               PrintCapBegins (program_name,device);
+               PrintCapBegins(program_name,device);

 #endif /* WIN32 */
                *ebuf = '\0';
                pd = pcap_open_live(device, snaplen, !pflag, 1000, ebuf);
 #endif /* WIN32 */
                *ebuf = '\0';
                pd = pcap_open_live(device, snaplen, !pflag, 1000, ebuf);


@@ -574,9 +564,7 @@ main(int argc, char **argv)
                error("%s", pcap_geterr(pd));
        if (dflag) {
                bpf_dump(&fcode, dflag);
                error("%s", pcap_geterr(pd));
        if (dflag) {
                bpf_dump(&fcode, dflag);

-#ifdef WIN32
-           pcap_close(pd);
-#endif /* WIN32 */
+               pcap_close(pd);

                exit(0);
        }
        init_addrtoname(localnet, netmask);
                exit(0);
        }
        init_addrtoname(localnet, netmask);


@@ -754,6 +742,24 @@ default_print_unaligned(register const u_char *cp, register u_int length)
 }
 
 #ifdef WIN32
 }
 
 #ifdef WIN32

+       /*
+        * XXX - there should really be libpcap calls to get the version
+        * number as a string (the string would be generated from #defines
+        * at run time, so that it's not generated from string constants
+        * in the library, as, on many UNIX systems, those constants would
+        * be statically linked into the application executable image, and
+        * would thus reflect the version of libpcap on the system on
+        * which the application was *linked*, not the system on which it's
+        * *running*.
+        *
+        * That routine should be documented, unlike the "version[]"
+        * string, so that UNIX vendors providing their own libpcaps
+        * don't omit it (as a couple of vendors have...).
+        *
+        * Packet.dll should perhaps also export a routine to return the
+        * version number of the Packet.dll code, to supply the
+        * "Wpcap_version" information on Windows.
+        */

        char WDversion[]="current-cvs.tcpdump.org";
        char version[]="current-cvs.tcpdump.org";
        char pcap_version[]="current-cvs.tcpdump.org";
        char WDversion[]="current-cvs.tcpdump.org";
        char version[]="current-cvs.tcpdump.org";
        char pcap_version[]="current-cvs.tcpdump.org";


@@ -770,7 +776,7 @@ default_print(register const u_char *bp, register u_int length)
 }
 
 #ifdef SIGINFO
 }
 
 #ifdef SIGINFO

-RETSIGTYPE requestinfo(int signo)
+RETSIGTYPE requestinfo(int signo _U_)

 {
        if (infodelay)
                ++infoprint;
 {
        if (infodelay)
                ++infoprint;


@@ -783,7 +789,11 @@ static void
 usage(void)
 {
        extern char version[];
 usage(void)
 {
        extern char version[];

+#if defined(WIN32) || defined(HAVE_PCAP_VERSION)

        extern char pcap_version[];
        extern char pcap_version[];

+#else
+       static char pcap_version[] = "unknown";
+#endif

 
 #ifdef WIN32
        (void)fprintf(stderr, "%s version %s, based on tcpdump version %s\n", program_name, WDversion, version);
 
 #ifdef WIN32
        (void)fprintf(stderr, "%s version %s, based on tcpdump version %s\n", program_name, WDversion, version);


@@ -794,12 +804,12 @@ usage(void)
 #endif /* WIN32 */
        (void)fprintf(stderr,
 #ifdef WIN32
 #endif /* WIN32 */
        (void)fprintf(stderr,
 #ifdef WIN32

-"Usage: %s [-adDeflnNOpqStuvxX] [-B size] [-c count] [ -C file_size ]\n", program_name);
+"Usage: %s [-aAdDeflnNOpqRStuvxX] [-B size] [-c count] [ -C file_size ]\n", program_name);

 #else /* WIN32 */
 #ifdef HAVE_PCAP_FINDALLDEVS
 #else /* WIN32 */
 #ifdef HAVE_PCAP_FINDALLDEVS

-"Usage: %s [-adDeflnNOpqStuvxX] [-c count] [ -C file_size ]\n", program_name);
+"Usage: %s [-aAdDeflnNOpqRStuvxX] [-c count] [ -C file_size ]\n", program_name);

 #else /* HAVE_PCAP_FINDALLDEVS */
 #else /* HAVE_PCAP_FINDALLDEVS */

-"Usage: %s [-adeflnNOpqStuvxX] [-c count] [ -C file_size ]\n", program_name);
+"Usage: %s [-aAdeflnNOpqRStuvxX] [-c count] [ -C file_size ]\n", program_name);

 #endif /* HAVE_PCAP_FINDALLDEVS */
 #endif /* WIN32 */
        (void)fprintf(stderr,
 #endif /* HAVE_PCAP_FINDALLDEVS */
 #endif /* WIN32 */
        (void)fprintf(stderr,