Reorganize netdissect.h

[tcpdump] / tcpdump.c

diff --git a/tcpdump.c b/tcpdump.c
index 4cf7484967a34c614f55b418b45ad72abd533954..ca46638e1662e64fa00f09eaf1126716e30dfd68 100644 (file)
--- a/tcpdump.c
+++ b/tcpdump.c
@@ -56,11 +56,6 @@ The Regents of the University of California.  All rights reserved.\n";
 
 #include <netdissect-stdinc.h>
 
 
 #include <netdissect-stdinc.h>
 

-#ifdef _WIN32
-#define off_t long
-#define uint UINT
-#endif /* _WIN32 */
-

 #ifdef USE_LIBSMI
 #include <smi.h>
 #endif
 #ifdef USE_LIBSMI
 #include <smi.h>
 #endif


@@ -1423,7 +1418,8 @@ main(int argc, char **argv)
 #endif /* HAVE_PCAP_SETDIRECTION */
 #else
                *ebuf = '\0';
 #endif /* HAVE_PCAP_SETDIRECTION */
 #else
                *ebuf = '\0';

-               pd = pcap_open_live(device, snaplen, !pflag, 1000, ebuf);
+               pd = pcap_open_live(device, ndo->ndo_snaplen, !pflag, 1000,
+                   ebuf);

                if (pd == NULL)
                        error("%s", ebuf);
                else if (*ebuf)
                if (pd == NULL)
                        error("%s", ebuf);
                else if (*ebuf)


@@ -1841,14 +1837,14 @@ child_cleanup(int signo _U_)
 static void
 info(register int verbose)
 {
 static void
 info(register int verbose)
 {

-       struct pcap_stat stat;
+       struct pcap_stat stats;

 
        /*
         * Older versions of libpcap didn't set ps_ifdrop on some
         * platforms; initialize it to 0 to handle that.
         */
 
        /*
         * Older versions of libpcap didn't set ps_ifdrop on some
         * platforms; initialize it to 0 to handle that.
         */

-       stat.ps_ifdrop = 0;
-       if (pcap_stats(pd, &stat) < 0) {
+       stats.ps_ifdrop = 0;
+       if (pcap_stats(pd, &stats) < 0) {

                (void)fprintf(stderr, "pcap_stats: %s\n", pcap_geterr(pd));
                infoprint = 0;
                return;
                (void)fprintf(stderr, "pcap_stats: %s\n", pcap_geterr(pd));
                infoprint = 0;
                return;


@@ -1863,21 +1859,21 @@ info(register int verbose)
                fputs(", ", stderr);
        else
                putc('\n', stderr);
                fputs(", ", stderr);
        else
                putc('\n', stderr);

-       (void)fprintf(stderr, "%u packet%s received by filter", stat.ps_recv,
-           PLURAL_SUFFIX(stat.ps_recv));
+       (void)fprintf(stderr, "%u packet%s received by filter", stats.ps_recv,
+           PLURAL_SUFFIX(stats.ps_recv));

        if (!verbose)
                fputs(", ", stderr);
        else
                putc('\n', stderr);
        if (!verbose)
                fputs(", ", stderr);
        else
                putc('\n', stderr);

-       (void)fprintf(stderr, "%u packet%s dropped by kernel", stat.ps_drop,
-           PLURAL_SUFFIX(stat.ps_drop));
-       if (stat.ps_ifdrop != 0) {
+       (void)fprintf(stderr, "%u packet%s dropped by kernel", stats.ps_drop,
+           PLURAL_SUFFIX(stats.ps_drop));
+       if (stats.ps_ifdrop != 0) {

                if (!verbose)
                        fputs(", ", stderr);
                else
                        putc('\n', stderr);
                (void)fprintf(stderr, "%u packet%s dropped by interface\n",
                if (!verbose)
                        fputs(", ", stderr);
                else
                        putc('\n', stderr);
                (void)fprintf(stderr, "%u packet%s dropped by interface\n",

-                   stat.ps_ifdrop, PLURAL_SUFFIX(stat.ps_ifdrop));
+                   stats.ps_ifdrop, PLURAL_SUFFIX(stats.ps_ifdrop));

        } else
                putc('\n', stderr);
        infoprint = 0;
        } else
                putc('\n', stderr);
        infoprint = 0;


@@ -2199,17 +2195,13 @@ RETSIGTYPE requestinfo(int signo _U_)
 void CALLBACK verbose_stats_dump (UINT timer_id _U_, UINT msg _U_, DWORD_PTR arg _U_,
                                  DWORD_PTR dw1 _U_, DWORD_PTR dw2 _U_)
 {
 void CALLBACK verbose_stats_dump (UINT timer_id _U_, UINT msg _U_, DWORD_PTR arg _U_,
                                  DWORD_PTR dw1 _U_, DWORD_PTR dw2 _U_)
 {

-       struct pcap_stat stat;
-
-       if (infodelay == 0 && pcap_stats(pd, &stat) >= 0)
+       if (infodelay == 0)

                fprintf(stderr, "Got %u\r", packets_captured);
 }
 #elif defined(HAVE_ALARM)
 static void verbose_stats_dump(int sig _U_)
 {
                fprintf(stderr, "Got %u\r", packets_captured);
 }
 #elif defined(HAVE_ALARM)
 static void verbose_stats_dump(int sig _U_)
 {

-       struct pcap_stat stat;
-
-       if (infodelay == 0 && pcap_stats(pd, &stat) >= 0)
+       if (infodelay == 0)

                fprintf(stderr, "Got %u\r", packets_captured);
        alarm(1);
 }
                fprintf(stderr, "Got %u\r", packets_captured);
        alarm(1);
 }