The Tcpdump Group git mirrors - tcpdump/blobdiff

index 11d1a0a9e36cd0f5c4d7854927f486452eb0523f..de8f63307d65c640e4ff88fe21d090624ace9f93 100644 (file)

--- a/tcpdump.c

+++ b/tcpdump.c

#include <netdissect-stdinc.h>

-#ifdef _WIN32

-#ifndef _WINSOCKAPI_

-#define _WINSOCKAPI_ /* Prevent inclusion of winsock.h in windows.h */

-#endif /* _WINSOCKAPI_ */

-#include <windows.h>

-#include <winsock2.h>

-extern int SIZE_BUF;

-#define off_t long

-#define uint UINT

-#endif /* _WIN32 */

#ifdef USE_LIBSMI

#include <smi.h>

#endif

#ifdef USE_LIBSMI

#include <smi.h>

#endif

@@ -310,23 +299,21 @@ show_dlts_and_exit(const char *device)

static void

show_devices_and_exit (void)

{

static void

show_devices_and_exit (void)

{

- pcap_if_t *devpointer;

+ pcap_if_t *dev, *devlist;

char ebuf[PCAP_ERRBUF_SIZE];

int i;

char ebuf[PCAP_ERRBUF_SIZE];

int i;

- if (pcap_findalldevs(&devpointer, ebuf) < 0)

+ if (pcap_findalldevs(&devlist, ebuf) < 0)

error("%s", ebuf);

- else {

- for (i = 0; devpointer != NULL; i++) {

- printf("%d.%s", i+1, devpointer->name);

- if (devpointer->description != NULL)

- printf(" (%s)", devpointer->description);

- if (devpointer->flags != 0)

- printf(" [%s]", bittok2str(status_flags, "none", devpointer->flags));

- printf("\n");

- devpointer = devpointer->next;

- }

+ for (i = 0, dev = devlist; dev != NULL; i++, dev = dev->next) {

+ printf("%d.%s", i+1, dev->name);

+ if (dev->description != NULL)

+ printf(" (%s)", dev->description);

+ if (dev->flags != 0)

+ printf(" [%s]", bittok2str(status_flags, "none", dev->flags));

+ printf("\n");

}

+ pcap_freealldevs(devlist);

exit(0);

}

#endif /* HAVE_PCAP_FINDALLDEVS */

exit(0);

}

#endif /* HAVE_PCAP_FINDALLDEVS */

@@ -727,7 +714,7 @@ main(int argc, char **argv)

char *ret = NULL;

char *end;

#ifdef HAVE_PCAP_FINDALLDEVS

char *ret = NULL;

char *end;

#ifdef HAVE_PCAP_FINDALLDEVS

- pcap_if_t *devpointer;

+ pcap_if_t *dev, *devlist;

int devnum;

#endif

int status;

int devnum;

#endif

int status;

@@ -736,16 +723,18 @@ main(int argc, char **argv)

cap_rights_t rights;

int cansandbox;

#endif /* HAVE_CAPSICUM */

cap_rights_t rights;

int cansandbox;

#endif /* HAVE_CAPSICUM */

- int Bflag=0; /* buffer size */

- int jflag=-1; /* packet time stamp source */

- int Oflag=1; /* run filter code optimizer */

- int pflag=0; /* don't go promiscuous */

+ int Bflag = 0; /* buffer size */

+ int jflag = -1; /* packet time stamp source */

+ int Oflag = 1; /* run filter code optimizer */

+ int pflag = 0; /* don't go promiscuous */

+ int yflag_dlt = -1;

+ const char *yflag_dlt_name = NULL;

netdissect_options Ndo;

netdissect_options *ndo = &Ndo;

int immediate_mode = 0;

memset(ndo, 0, sizeof(*ndo));

netdissect_options Ndo;

netdissect_options *ndo = &Ndo;

int immediate_mode = 0;

memset(ndo, 0, sizeof(*ndo));

- ndo->ndo_dlt=-1;

ndo_set_function_pointers(ndo);

ndo->ndo_snaplen = DEFAULT_SNAPLEN;

ndo_set_function_pointers(ndo);

ndo->ndo_snaplen = DEFAULT_SNAPLEN;

@@ -892,22 +881,20 @@ main(int argc, char **argv)

if (devnum < 0)

error("Invalid adapter index");

if (devnum < 0)

error("Invalid adapter index");

- if (pcap_findalldevs(&devpointer, ebuf) < 0)

+ if (pcap_findalldevs(&devlist, ebuf) < 0)

error("%s", ebuf);

- else {

- /*

- * Look for the devnum-th entry

- * in the list of devices

- * (1-based).

- */

- for (i = 0;

- i < devnum-1 && devpointer != NULL;

- i++, devpointer = devpointer->next)

- ;

- if (devpointer == NULL)

- error("Invalid adapter index");

- }

- device = devpointer->name;

+ /*

+ * Look for the devnum-th entry in the

+ * list of devices (1-based).

+ */

+ for (i = 0, dev = devlist;

+ i < devnum-1 && dev != NULL;

+ i++, dev = dev->next)

+ ;

+ if (dev == NULL)

+ error("Invalid adapter index");

+ device = strdup(dev->name);

+ pcap_freealldevs(devlist);

break;

}

#endif /* HAVE_PCAP_FINDALLDEVS */

break;

}

#endif /* HAVE_PCAP_FINDALLDEVS */

@@ -1110,11 +1097,11 @@ main(int argc, char **argv)

break;

case 'y':

break;

case 'y':

- ndo->ndo_dltname = optarg;

- ndo->ndo_dlt =

- pcap_datalink_name_to_val(ndo->ndo_dltname);

- if (ndo->ndo_dlt < 0)

- error("invalid data link type %s", ndo->ndo_dltname);

+ yflag_dlt_name = optarg;

+ yflag_dlt =

+ pcap_datalink_name_to_val(yflag_dlt_name);

+ if (yflag_dlt < 0)

+ error("invalid data link type %s", yflag_dlt_name);

break;

#if defined(HAVE_PCAP_DEBUG) || defined(HAVE_YYDEBUG)

break;

#if defined(HAVE_PCAP_DEBUG) || defined(HAVE_YYDEBUG)

@@ -1260,7 +1247,7 @@ main(int argc, char **argv)

VFile = fopen(VFileName, "r");

if (VFile == NULL)

VFile = fopen(VFileName, "r");

if (VFile == NULL)

- error("Unable to open file: %s\n", strerror(errno));

+ error("Unable to open file: %s\n", pcap_strerror(errno));

ret = get_next_file(VFile, VFileLine);

if (!ret)

ret = get_next_file(VFile, VFileLine);

if (!ret)

@@ -1300,7 +1287,15 @@ main(int argc, char **argv)

* We're doing a live capture.

if (device == NULL) {

* We're doing a live capture.

if (device == NULL) {

+#ifdef HAVE_PCAP_FINDALLDEVS

+ if (pcap_findalldevs(&devlist, ebuf) >= 0 &&

+ devlist != NULL) {

+ device = strdup(devlist->name);

+ pcap_freealldevs(devlist);

+ }

+#else /* HAVE_PCAP_FINDALLDEVS */

device = pcap_lookupdev(ebuf);

+#endif

if (device == NULL)

error("%s", ebuf);

}

if (device == NULL)

error("%s", ebuf);

}

@@ -1427,7 +1422,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)

@@ -1448,9 +1444,9 @@ main(int argc, char **argv)

#endif /* !defined(HAVE_PCAP_CREATE) && defined(_WIN32) */

if (Lflag)

show_dlts_and_exit(device);

#endif /* !defined(HAVE_PCAP_CREATE) && defined(_WIN32) */

if (Lflag)

show_dlts_and_exit(device);

- if (ndo->ndo_dlt >= 0) {

+ if (yflag_dlt >= 0) {

#ifdef HAVE_PCAP_SET_DATALINK

- if (pcap_set_datalink(pd, ndo->ndo_dlt) < 0)

+ if (pcap_set_datalink(pd, yflag_dlt) < 0)

error("%s", pcap_geterr(pd));

#else

error("%s", pcap_geterr(pd));

#else

@@ -1458,13 +1454,13 @@ main(int argc, char **argv)

* data link type, so we only let them

* set it to what it already is.

* data link type, so we only let them

* set it to what it already is.

- if (ndo->ndo_dlt != pcap_datalink(pd)) {

+ if (yflag_dlt != pcap_datalink(pd)) {

error("%s is not one of the DLTs supported by this device\n",

- ndo->ndo_dltname);

+ yflag_dlt_name);

}

#endif

(void)fprintf(stderr, "%s: data link type %s\n",

}

#endif

(void)fprintf(stderr, "%s: data link type %s\n",

- program_name, ndo->ndo_dltname);

+ program_name, yflag_dlt_name);

(void)fflush(stderr);

}

i = pcap_snapshot(pd);

(void)fflush(stderr);

}

i = pcap_snapshot(pd);

@@ -1559,7 +1555,7 @@ main(int argc, char **argv)

error("%s", pcap_geterr(pd));

#ifdef HAVE_CAPSICUM

if (RFileName == NULL && VFileName == NULL) {

error("%s", pcap_geterr(pd));

#ifdef HAVE_CAPSICUM

if (RFileName == NULL && VFileName == NULL) {

- static const unsigned long cmds[] = { BIOCGSTATS };

+ static const unsigned long cmds[] = { BIOCGSTATS, BIOCROTZBUF };

cap_rights_init(&rights, CAP_IOCTL, CAP_READ);

if (cap_rights_limit(pcap_fileno(pd), &rights) < 0 &&

cap_rights_init(&rights, CAP_IOCTL, CAP_READ);

if (cap_rights_limit(pcap_fileno(pd), &rights) < 0 &&

@@ -1845,14 +1841,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;

@@ -1867,38 +1863,52 @@ 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;

}

#if defined(HAVE_FORK) || defined(HAVE_VFORK)

} else

putc('\n', stderr);

infoprint = 0;

}

#if defined(HAVE_FORK) || defined(HAVE_VFORK)

+#ifdef HAVE_FORK

+#define fork_subprocess() fork()

+#else

+#define fork_subprocess() vfork()

+#endif

static void

compress_savefile(const char *filename)

{

static void

compress_savefile(const char *filename)

{

-# ifdef HAVE_FORK

- if (fork())

-# else

- if (vfork())

-# endif

+ pid_t child;

+ child = fork_subprocess();

+ if (child == -1) {

+ fprintf(stderr,

+ "compress_savefile: fork failed: %s\n",

+ pcap_strerror(errno));

+ return;

+ }

+ if (child != 0) {

+ /* Parent process. */

return;

+ }

- * Set to lowest priority so that this doesn't disturb the capture

+ * Child process.

+ * Set to lowest priority so that this doesn't disturb the capture.

#ifdef NZERO

setpriority(PRIO_PROCESS, 0, NZERO - 1);

#ifdef NZERO

setpriority(PRIO_PROCESS, 0, NZERO - 1);

@@ -1907,15 +1917,15 @@ compress_savefile(const char *filename)

#endif

if (execlp(zflag, zflag, filename, (char *)NULL) == -1)

fprintf(stderr,

#endif

if (execlp(zflag, zflag, filename, (char *)NULL) == -1)

fprintf(stderr,

- "compress_savefile:execlp(%s, %s): %s\n",

+ "compress_savefile: execlp(%s, %s) failed: %s\n",

zflag,

filename,

zflag,

filename,

- strerror(errno));

-# ifdef HAVE_FORK

+ pcap_strerror(errno));

+#ifdef HAVE_FORK

exit(1);

-# else

+#else

_exit(1);

-# endif

+#endif

}

#else /* HAVE_FORK && HAVE_VFORK */

static void

}

#else /* HAVE_FORK && HAVE_VFORK */

static void

@@ -2203,17 +2213,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);

}