The Tcpdump Group git mirrors - tcpdump/blobdiff

diff --git a/tcpdump.c b/tcpdump.c

index 063ac7b40839ffa8535d3f030109b146f0ba0dda..a0c627c66361cb9cc2f2fd3f76fbc31db2fc9c98 100644 (file)

--- a/tcpdump.c

+++ b/tcpdump.c

#endif

/*

- * tcpdump - monitor tcp/ip traffic on an ethernet.

+ * tcpdump - dump traffic on a network

*

* First written in 1987 by Van Jacobson, Lawrence Berkeley Laboratory.

* Mercilessly hacked and occasionally improved since then via the

#endif

-#include <tcpdump-stdinc.h>

-

-#ifdef _WIN32

-#include "w32_fzs.h"

-extern int SIZE_BUF;

-#define off_t long

-#define uint UINT

-#endif /* _WIN32 */

+#include <netdissect-stdinc.h>

#ifdef USE_LIBSMI

#include <smi.h>

@@ -479,7 +472,8 @@ droproot(const char *username, const char *chroot_dir)

struct passwd *pw = NULL;

if (chroot_dir && !username) {

- fprintf(stderr, "tcpdump: Chroot without dropping root is insecure\n");

+ fprintf(stderr, "%s: Chroot without dropping root is insecure\n",

+ program_name);

exit(1);

}

@@ -487,8 +481,8 @@ droproot(const char *username, const char *chroot_dir)

if (pw) {

if (chroot_dir) {

if (chroot(chroot_dir) != 0 || chdir ("/") != 0) {

- fprintf(stderr, "tcpdump: Couldn't chroot/chdir to '%.64s': %s\n",

- chroot_dir, pcap_strerror(errno));

+ fprintf(stderr, "%s: Couldn't chroot/chdir to '%.64s': %s\n",

+ program_name, chroot_dir, pcap_strerror(errno));

exit(1);

}

@@ -504,11 +498,11 @@ droproot(const char *username, const char *chroot_dir)

#else

if (initgroups(pw->pw_name, pw->pw_gid) != 0 ||

setgid(pw->pw_gid) != 0 || setuid(pw->pw_uid) != 0) {

- fprintf(stderr, "tcpdump: Couldn't change to '%.32s' uid=%lu gid=%lu: %s\n",

- username,

- (unsigned long)pw->pw_uid,

- (unsigned long)pw->pw_gid,

- pcap_strerror(errno));

+ fprintf(stderr, "%s: Couldn't change to '%.32s' uid=%lu gid=%lu: %s\n",

+ program_name, username,

+ (unsigned long)pw->pw_uid,

+ (unsigned long)pw->pw_gid,

+ pcap_strerror(errno));

exit(1);

}

else {

@@ -517,8 +511,8 @@ droproot(const char *username, const char *chroot_dir)

#endif /* HAVE_LIBCAP_NG */

}

else {

- fprintf(stderr, "tcpdump: Couldn't find user '%.32s'\n",

- username);

+ fprintf(stderr, "%s: Couldn't find user '%.32s'\n",

+ program_name, username);

exit(1);

}

#ifdef HAVE_LIBCAP_NG

@@ -706,7 +700,6 @@ main(int argc, char **argv)

int timezone_offset = 0;

register char *cp, *infile, *cmdbuf, *device, *RFileName, *VFileName, *WFileName;

pcap_handler callback;

- int type;

int dlt;

int new_dlt;

const char *dlt_name;

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

#ifndef _WIN32

RETSIGTYPE (*oldhandler)(int);

#endif

- struct print_info printinfo;

struct dump_info dumpinfo;

u_char *pcap_userdata;

char ebuf[PCAP_ERRBUF_SIZE];

@@ -733,22 +725,20 @@ main(int argc, char **argv)

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;

-

-#ifdef _WIN32

- if(wsockinit() != 0) return 1;

-#endif /* _WIN32 */

+ int immediate_mode = 0;

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

- ndo->ndo_dlt=-1;

ndo_set_function_pointers(ndo);

ndo->ndo_snaplen = DEFAULT_SNAPLEN;

- ndo->ndo_immediate = 0;

cnt = -1;

device = NULL;

@@ -763,6 +753,11 @@ main(int argc, char **argv)

else

ndo->program_name = program_name = argv[0];

+#ifdef _WIN32

+ if (pcap_wsockinit() != 0)

+ error("Attempting to initialize Winsock failed");

+#endif /* _WIN32 */

+

/*

* On platforms where the CPU doesn't support unaligned loads,

* force unaligned accesses to abort with SIGBUS, rather than

@@ -958,7 +953,7 @@ main(int argc, char **argv)

if (smiLoadModule(optarg) == 0) {

error("could not load MIB module %s", optarg);

}

- ndo->ndo_sflag = 1;

+ ndo->ndo_mflag = 1;

#else

(void)fprintf(stderr, "%s: ignoring option `-m %s' ",

program_name, optarg);

@@ -1106,11 +1101,11 @@ main(int argc, char **argv)

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)

@@ -1129,7 +1124,7 @@ main(int argc, char **argv)

#endif

case 'z':

zflag = strdup(optarg);

- if (zflag == NULL)

+ if (zflag == NULL)

error("Unable to allocate memory for -z argument");

break;

@@ -1158,7 +1153,7 @@ main(int argc, char **argv)

#ifdef HAVE_PCAP_SET_IMMEDIATE_MODE

case OPTION_IMMEDIATE_MODE:

- ndo->ndo_immediate = 1;

+ immediate_mode = 1;

break;

#endif

@@ -1205,7 +1200,7 @@ main(int argc, char **argv)

* probably expecting to see packets pop up immediately.

*/

if (WFileName == NULL && isatty(1))

- ndo->ndo_immediate = 1;

+ immediate_mode = 1;

#endif

#ifdef WITH_CHROOT

@@ -1296,7 +1291,12 @@ main(int argc, char **argv)

* We're doing a live capture.

*/

if (device == NULL) {

+#ifdef HAVE_PCAP_FINDALLDEVS

+ if (pcap_findalldevs(&devpointer, ebuf) >= 0 && devpointer != NULL)

+ device = devpointer->name;

+#else /* HAVE_PCAP_FINDALLDEVS */

device = pcap_lookupdev(ebuf);

+#endif

if (device == NULL)

error("%s", ebuf);

}

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

#endif

#ifdef HAVE_PCAP_SET_IMMEDIATE_MODE

- if (ndo->ndo_immediate) {

+ if (immediate_mode) {

status = pcap_set_immediate_mode(pd, 1);

if (status != 0)

error("%s: Can't set immediate mode: %s",

@@ -1423,7 +1423,8 @@ main(int argc, char **argv)

#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)

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

#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

/*

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

* 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",

- program_name, ndo->ndo_dltname);

+ program_name, yflag_dlt_name);

(void)fflush(stderr);

}

i = pcap_snapshot(pd);

@@ -1640,10 +1641,10 @@ main(int argc, char **argv)

pcap_dump_flush(p);

#endif

} else {

- type = pcap_datalink(pd);

- printinfo = get_print_info(ndo, type);

+ dlt = pcap_datalink(pd);

+ ndo->ndo_if_printer = get_if_printer(ndo, dlt);

callback = print_packet;

- pcap_userdata = (u_char *)&printinfo;

+ pcap_userdata = (u_char *)ndo;

}

#ifdef SIGNAL_REQ_INFO

@@ -1761,7 +1762,7 @@ main(int argc, char **argv)

new_dlt = pcap_datalink(pd);

if (WFileName && new_dlt != dlt)

error("%s: new dlt does not match original", RFileName);

- printinfo = get_print_info(ndo, new_dlt);

+ ndo->ndo_if_printer = get_if_printer(ndo, 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",

@@ -1841,14 +1842,14 @@ child_cleanup(int signo _U_)

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.

*/

- 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;

@@ -1863,21 +1864,21 @@ info(register int verbose)

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);

- (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",

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

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

} else

putc('\n', stderr);

infoprint = 0;

@@ -2144,15 +2145,11 @@ dump_packet(u_char *user, const struct pcap_pkthdr *h, const u_char *sp)

static void

print_packet(u_char *user, const struct pcap_pkthdr *h, const u_char *sp)

{

- struct print_info *print_info;

-

++packets_captured;

++infodelay;

- print_info = (struct print_info *)user;

-

- pretty_print_packet(print_info, h, sp, packets_captured);

+ pretty_print_packet((netdissect_options *)user, h, sp, packets_captured);

--infodelay;

if (infoprint)

@@ -2203,17 +2200,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_)

{

- 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_)

{

- struct pcap_stat stat;

-

- if (infodelay == 0 && pcap_stats(pd, &stat) >= 0)

+ if (infodelay == 0)

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

alarm(1);

}