The Tcpdump Group git mirrors - tcpdump/blobdiff

index 2b7dfa978b93cd4f21f764ae9fa11947a50d1b17..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

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

#ifdef USE_LIBSMI

#include <smi.h>

@@ -93,12 +86,12 @@ extern int SIZE_BUF;

#include <stdlib.h>

#include <string.h>

#include <limits.h>

#include <stdlib.h>

#include <string.h>

#include <limits.h>

-#ifndef WIN32

+#ifndef _WIN32

#include <sys/wait.h>

#include <sys/resource.h>

#include <pwd.h>

#include <grp.h>

#include <sys/wait.h>

#include <sys/resource.h>

#include <pwd.h>

#include <grp.h>

-#endif /* WIN32 */

+#endif /* _WIN32 */

/* capabilities convenience library */

/* If a code depends on HAVE_LIBCAP_NG, it depends also on HAVE_CAP_NG_H.

/* capabilities convenience library */

/* If a code depends on HAVE_LIBCAP_NG, it depends also on HAVE_CAP_NG_H.

@@ -361,13 +354,13 @@ show_devices_and_exit (void)

* Set up flags that might or might not be supported depending on the

* version of libpcap we're using.

* Set up flags that might or might not be supported depending on the

* version of libpcap we're using.

-#if defined(HAVE_PCAP_CREATE) || defined(WIN32)

+#if defined(HAVE_PCAP_CREATE) || defined(_WIN32)

#define B_FLAG "B:"

#define B_FLAG_USAGE " [ -B size ]"

#define B_FLAG "B:"

#define B_FLAG_USAGE " [ -B size ]"

-#else /* defined(HAVE_PCAP_CREATE) || defined(WIN32) */

+#else /* defined(HAVE_PCAP_CREATE) || defined(_WIN32) */

#define B_FLAG

#define B_FLAG_USAGE

#define B_FLAG

#define B_FLAG_USAGE

-#endif /* defined(HAVE_PCAP_CREATE) || defined(WIN32) */

+#endif /* defined(HAVE_PCAP_CREATE) || defined(_WIN32) */

#ifdef HAVE_PCAP_CREATE

#define I_FLAG "I"

#ifdef HAVE_PCAP_CREATE

#define I_FLAG "I"

@@ -403,7 +396,7 @@ show_devices_and_exit (void)

#define Q_FLAG

#endif

#define Q_FLAG

#endif

-#define SHORTOPTS "aAb" B_FLAG "c:C:d" D_FLAG "eE:fF:G:hHi:" I_FLAG j_FLAG J_FLAG "KlLm:M:nNOpq" Q_FLAG "r:Rs:StT:u" U_FLAG "vV:w:W:xXy:Yz:Z:#"

+#define SHORTOPTS "aAb" B_FLAG "c:C:d" D_FLAG "eE:fF:G:hHi:" I_FLAG j_FLAG J_FLAG "KlLm:M:nNOpq" Q_FLAG "r:s:StT:u" U_FLAG "vV:w:W:xXy:Yz:Z:#"

* Long options.

@@ -430,7 +423,7 @@ show_devices_and_exit (void)

#define OPTION_IMMEDIATE_MODE 130

static const struct option longopts[] = {

#define OPTION_IMMEDIATE_MODE 130

static const struct option longopts[] = {

-#if defined(HAVE_PCAP_CREATE) || defined(WIN32)

+#if defined(HAVE_PCAP_CREATE) || defined(_WIN32)

{ "buffer-size", required_argument, NULL, 'B' },

#endif

{ "list-interfaces", no_argument, NULL, 'D' },

{ "buffer-size", required_argument, NULL, 'B' },

#endif

{ "list-interfaces", no_argument, NULL, 'D' },

@@ -471,7 +464,7 @@ static const struct option longopts[] = {

{ NULL, 0, NULL, 0 }

};

{ NULL, 0, NULL, 0 }

};

-#ifndef WIN32

+#ifndef _WIN32

/* Drop root privileges and chroot if necessary */

static void

droproot(const char *username, const char *chroot_dir)

/* Drop root privileges and chroot if necessary */

static void

droproot(const char *username, const char *chroot_dir)

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

struct passwd *pw = NULL;

if (chroot_dir && !username) {

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

}

exit(1);

}

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

if (pw) {

if (chroot_dir) {

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

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

}

#ifdef HAVE_LIBCAP_NG

exit(1);

}

#ifdef HAVE_LIBCAP_NG

- int ret = capng_change_id(pw->pw_uid, pw->pw_gid, CAPNG_NO_FLAG);

- if (ret < 0) {

- fprintf(stderr, "error : ret %d\n", ret);

- }

- else {

- fprintf(stderr, "dropped privs to %s\n", username);

+ {

+ int ret = capng_change_id(pw->pw_uid, pw->pw_gid, CAPNG_NO_FLAG);

+ if (ret < 0) {

+ fprintf(stderr, "error : ret %d\n", ret);

+ } else {

+ fprintf(stderr, "dropped privs to %s\n", username);

+ }

}

#else

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

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

}

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

exit(1);

}

else {

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

#endif /* HAVE_LIBCAP_NG */

}

else {

#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

exit(1);

}

#ifdef HAVE_LIBCAP_NG

@@ -532,7 +527,7 @@ droproot(const char *username, const char *chroot_dir)

#endif /* HAVE_LIBCAP_NG */

}

#endif /* HAVE_LIBCAP_NG */

}

-#endif /* WIN32 */

+#endif /* _WIN32 */

static int

getWflagChars(int x)

static int

getWflagChars(int x)

@@ -705,15 +700,13 @@ main(int argc, char **argv)

int timezone_offset = 0;

pcap_handler callback;

int timezone_offset = 0;

pcap_handler callback;

- int type;

int dlt;

int new_dlt;

const char *dlt_name;

struct bpf_program fcode;

int dlt;

int new_dlt;

const char *dlt_name;

struct bpf_program fcode;

-#ifndef WIN32

+#ifndef _WIN32

RETSIGTYPE (*oldhandler)(int);

#endif

RETSIGTYPE (*oldhandler)(int);

#endif

- struct print_info printinfo;

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

@@ -732,23 +725,20 @@ 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;

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_Rflag=1;

- ndo->ndo_dlt=-1;

ndo_set_function_pointers(ndo);

ndo->ndo_snaplen = DEFAULT_SNAPLEN;

ndo_set_function_pointers(ndo);

ndo->ndo_snaplen = DEFAULT_SNAPLEN;

- ndo->ndo_immediate = 0;

cnt = -1;

device = NULL;

cnt = -1;

device = NULL;

@@ -759,9 +749,14 @@ main(int argc, char **argv)

WFileName = NULL;

dlt = -1;

if ((cp = strrchr(argv[0], '/')) != NULL)

WFileName = NULL;

dlt = -1;

if ((cp = strrchr(argv[0], '/')) != NULL)

- program_name = cp + 1;

+ ndo->program_name = program_name = cp + 1;

else

- program_name = argv[0];

+ 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,

@@ -793,13 +788,13 @@ main(int argc, char **argv)

++ndo->ndo_bflag;

break;

++ndo->ndo_bflag;

break;

-#if defined(HAVE_PCAP_CREATE) || defined(WIN32)

+#if defined(HAVE_PCAP_CREATE) || defined(_WIN32)

case 'B':

Bflag = atoi(optarg)*1024;

if (Bflag <= 0)

error("invalid packet buffer size %s", optarg);

break;

case 'B':

Bflag = atoi(optarg)*1024;

if (Bflag <= 0)

error("invalid packet buffer size %s", optarg);

break;

-#endif /* defined(HAVE_PCAP_CREATE) || defined(WIN32) */

+#endif /* defined(HAVE_PCAP_CREATE) || defined(_WIN32) */

case 'c':

cnt = atoi(optarg);

case 'c':

cnt = atoi(optarg);

@@ -929,24 +924,24 @@ main(int argc, char **argv)

#endif

case 'l':

#endif

case 'l':

-#ifdef WIN32

+#ifdef _WIN32

* _IOLBF is the same as _IOFBF in Microsoft's C

* libraries; the only alternative they offer

* is _IONBF.

* XXX - this should really be checking for MSVC++,

* _IOLBF is the same as _IOFBF in Microsoft's C

* libraries; the only alternative they offer

* is _IONBF.

* XXX - this should really be checking for MSVC++,

- * not WIN32, if, for example, MinGW has its own

+ * not _WIN32, if, for example, MinGW has its own

* C library that is more UNIX-compatible.

setvbuf(stdout, NULL, _IONBF, 0);

* C library that is more UNIX-compatible.

setvbuf(stdout, NULL, _IONBF, 0);

-#else /* WIN32 */

+#else /* _WIN32 */

#ifdef HAVE_SETLINEBUF

setlinebuf(stdout);

#else

setvbuf(stdout, NULL, _IOLBF, 0);

#endif

#ifdef HAVE_SETLINEBUF

setlinebuf(stdout);

#else

setvbuf(stdout, NULL, _IOLBF, 0);

#endif

-#endif /* WIN32 */

+#endif /* _WIN32 */

break;

case 'K':

break;

case 'K':

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

if (smiLoadModule(optarg) == 0) {

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

}

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

#else

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

program_name, optarg);

@@ -1012,10 +1007,6 @@ main(int argc, char **argv)

RFileName = optarg;

break;

RFileName = optarg;

break;

- case 'R':

- ndo->ndo_Rflag = 0;

- break;

case 's':

ndo->ndo_snaplen = strtol(optarg, &end, 0);

if (optarg == end || *end != '\0'

case 's':

ndo->ndo_snaplen = strtol(optarg, &end, 0);

if (optarg == end || *end != '\0'

@@ -1110,11 +1101,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)

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

#endif

case 'z':

zflag = strdup(optarg);

#endif

case 'z':

zflag = strdup(optarg);

- if (zflag == NULL)

+ if (zflag == NULL)

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

break;

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

break;

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

#ifdef HAVE_PCAP_SET_IMMEDIATE_MODE

case OPTION_IMMEDIATE_MODE:

#ifdef HAVE_PCAP_SET_IMMEDIATE_MODE

case OPTION_IMMEDIATE_MODE:

- ndo->ndo_immediate = 1;

+ immediate_mode = 1;

break;

#endif

break;

#endif

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

* probably expecting to see packets pop up immediately.

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

* probably expecting to see packets pop up immediately.

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

- ndo->ndo_immediate = 1;

+ immediate_mode = 1;

#endif

#ifdef WITH_CHROOT

#endif

#ifdef WITH_CHROOT

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

* In either case, we're reading a savefile, not doing

* a live capture.

* In either case, we're reading a savefile, not doing

* a live capture.

-#ifndef WIN32

+#ifndef _WIN32

* We don't need network access, so relinquish any set-UID

* or set-GID privileges we have (if any).

* We don't need network access, so relinquish any set-UID

* or set-GID privileges we have (if any).

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

if (setgid(getgid()) != 0 || setuid(getuid()) != 0 )

fprintf(stderr, "Warning: setgid/setuid failed !\n");

if (setgid(getgid()) != 0 || setuid(getuid()) != 0 )

fprintf(stderr, "Warning: setgid/setuid failed !\n");

-#endif /* WIN32 */

+#endif /* _WIN32 */

if (VFileName != NULL) {

if (VFileName[0] == '-' && VFileName[1] == '\0')

VFile = stdin;

if (VFileName != NULL) {

if (VFileName[0] == '-' && VFileName[1] == '\0')

VFile = stdin;

@@ -1300,11 +1291,16 @@ 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(&devpointer, ebuf) >= 0 && devpointer != NULL)

+ device = devpointer->name;

+#else /* HAVE_PCAP_FINDALLDEVS */

device = pcap_lookupdev(ebuf);

+#endif

if (device == NULL)

error("%s", ebuf);

}

if (device == NULL)

error("%s", ebuf);

}

-#ifdef WIN32

+#ifdef _WIN32

* Print a message to the standard error on Windows.

* XXX - why do it here, with a different message?

* Print a message to the standard error on Windows.

* XXX - why do it here, with a different message?

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

}

fflush(stderr);

}

fflush(stderr);

-#endif /* WIN32 */

+#endif /* _WIN32 */

#ifdef HAVE_PCAP_CREATE

pd = pcap_create(device, ebuf);

if (pd == NULL)

#ifdef HAVE_PCAP_CREATE

pd = pcap_create(device, ebuf);

if (pd == NULL)

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

#endif

#ifdef HAVE_PCAP_SET_IMMEDIATE_MODE

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

status = pcap_set_immediate_mode(pd, 1);

if (status != 0)

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

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

@@ -1436,21 +1433,21 @@ main(int argc, char **argv)

* Let user own process after socket has been opened.

-#ifndef WIN32

+#ifndef _WIN32

if (setgid(getgid()) != 0 || setuid(getuid()) != 0)

fprintf(stderr, "Warning: setgid/setuid failed !\n");

if (setgid(getgid()) != 0 || setuid(getuid()) != 0)

fprintf(stderr, "Warning: setgid/setuid failed !\n");

-#endif /* WIN32 */

-#if !defined(HAVE_PCAP_CREATE) && defined(WIN32)

+#endif /* _WIN32 */

+#if !defined(HAVE_PCAP_CREATE) && defined(_WIN32)

if(Bflag != 0)

if(pcap_setbuff(pd, Bflag)==-1){

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

}

if(Bflag != 0)

if(pcap_setbuff(pd, Bflag)==-1){

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

}

-#endif /* !defined(HAVE_PCAP_CREATE) && defined(WIN32) */

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

if (Lflag)

show_dlts_and_exit(device);

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 +1455,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);

@@ -1494,21 +1491,21 @@ main(int argc, char **argv)

}

init_print(ndo, localnet, netmask, timezone_offset);

}

init_print(ndo, localnet, netmask, timezone_offset);

-#ifndef WIN32

+#ifndef _WIN32

(void)setsignal(SIGPIPE, cleanup);

(void)setsignal(SIGTERM, cleanup);

(void)setsignal(SIGINT, cleanup);

(void)setsignal(SIGPIPE, cleanup);

(void)setsignal(SIGTERM, cleanup);

(void)setsignal(SIGINT, cleanup);

-#endif /* WIN32 */

+#endif /* _WIN32 */

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

(void)setsignal(SIGCHLD, child_cleanup);

#endif

/* Cooperate with nohup(1) */

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

(void)setsignal(SIGCHLD, child_cleanup);

#endif

/* Cooperate with nohup(1) */

-#ifndef WIN32

+#ifndef _WIN32

if ((oldhandler = setsignal(SIGHUP, cleanup)) != SIG_DFL)

(void)setsignal(SIGHUP, oldhandler);

if ((oldhandler = setsignal(SIGHUP, cleanup)) != SIG_DFL)

(void)setsignal(SIGHUP, oldhandler);

-#endif /* WIN32 */

+#endif /* _WIN32 */

-#ifndef WIN32

+#ifndef _WIN32

* If a user name was specified with "-Z", attempt to switch to

* that user's UID. This would probably be used with sudo,

* If a user name was specified with "-Z", attempt to switch to

* that user's UID. This would probably be used with sudo,

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

droproot(username, chroot_dir);

}

droproot(username, chroot_dir);

}

-#endif /* WIN32 */

+#endif /* _WIN32 */

if (pcap_setfilter(pd, &fcode) < 0)

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

if (pcap_setfilter(pd, &fcode) < 0)

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

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

pcap_dump_flush(p);

#endif

} else {

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

}

#ifdef SIGNAL_REQ_INFO

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

#endif

}

#endif

}

-#ifndef WIN32

+#ifndef _WIN32

if (RFileName == NULL) {

* Live capture (if -V was specified, we set RFileName

if (RFileName == NULL) {

* Live capture (if -V was specified, we set RFileName

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

}

(void)fflush(stderr);

}

(void)fflush(stderr);

}

-#endif /* WIN32 */

+#endif /* _WIN32 */

#ifdef HAVE_CAPSICUM

cansandbox = (ndo->ndo_nflag && VFileName == NULL && zflag == NULL);

#ifdef HAVE_CAPSICUM

cansandbox = (ndo->ndo_nflag && VFileName == NULL && zflag == NULL);

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

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

dlt_name = pcap_datalink_val_to_name(new_dlt);

if (dlt_name == NULL) {

fprintf(stderr, "reading from file %s, link-type %u\n",

@@ -1845,14 +1842,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,21 +1864,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;

@@ -2148,22 +2145,18 @@ 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)

{

static void

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

{

- struct print_info *print_info;

++packets_captured;

++infodelay;

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

info(0);

}

--infodelay;

if (infoprint)

info(0);

}

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

* XXX - there should really be libpcap calls to get the version

* number as a string (the string would be generated from #defines

@@ -2207,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_)

{

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

}

@@ -2229,28 +2218,28 @@ print_version(void)

{

extern char version[];

#ifndef HAVE_PCAP_LIB_VERSION

{

extern char version[];

#ifndef HAVE_PCAP_LIB_VERSION

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

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

extern char pcap_version[];

-#else /* defined(WIN32) || defined(HAVE_PCAP_VERSION) */

+#else /* defined(_WIN32) || defined(HAVE_PCAP_VERSION) */

static char pcap_version[] = "unknown";

-#endif /* defined(WIN32) || defined(HAVE_PCAP_VERSION) */

+#endif /* defined(_WIN32) || defined(HAVE_PCAP_VERSION) */

#endif /* HAVE_PCAP_LIB_VERSION */

#ifdef HAVE_PCAP_LIB_VERSION

#endif /* HAVE_PCAP_LIB_VERSION */

#ifdef HAVE_PCAP_LIB_VERSION

-#ifdef WIN32

+#ifdef _WIN32

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

-#else /* WIN32 */

+#else /* _WIN32 */

(void)fprintf(stderr, "%s version %s\n", program_name, version);

-#endif /* WIN32 */

+#endif /* _WIN32 */

(void)fprintf(stderr, "%s\n",pcap_lib_version());

#else /* HAVE_PCAP_LIB_VERSION */

(void)fprintf(stderr, "%s\n",pcap_lib_version());

#else /* HAVE_PCAP_LIB_VERSION */

-#ifdef WIN32

+#ifdef _WIN32

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

(void)fprintf(stderr, "WinPcap version %s, based on libpcap version %s\n",Wpcap_version, pcap_version);

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

(void)fprintf(stderr, "WinPcap version %s, based on libpcap version %s\n",Wpcap_version, pcap_version);

-#else /* WIN32 */

+#else /* _WIN32 */

(void)fprintf(stderr, "%s version %s\n", program_name, version);

(void)fprintf(stderr, "libpcap version %s\n", pcap_version);

(void)fprintf(stderr, "%s version %s\n", program_name, version);

(void)fprintf(stderr, "libpcap version %s\n", pcap_version);

-#endif /* WIN32 */

+#endif /* _WIN32 */

#endif /* HAVE_PCAP_LIB_VERSION */

#if defined(HAVE_LIBCRYPTO) && defined(SSLEAY_VERSION)

#endif /* HAVE_PCAP_LIB_VERSION */

#if defined(HAVE_LIBCRYPTO) && defined(SSLEAY_VERSION)

@@ -2268,7 +2257,7 @@ print_usage(void)

{

print_version();

(void)fprintf(stderr,

{

print_version();

(void)fprintf(stderr,

-"Usage: %s [-aAbd" D_FLAG "efhH" I_FLAG J_FLAG "KlLnNOpqRStu" U_FLAG "vxX#]" B_FLAG_USAGE " [ -c count ]\n", program_name);

+"Usage: %s [-aAbd" D_FLAG "efhH" I_FLAG J_FLAG "KlLnNOpqStu" U_FLAG "vxX#]" B_FLAG_USAGE " [ -c count ]\n", program_name);

(void)fprintf(stderr,

"\t\t[ -C file_size ] [ -E algo:secret ] [ -F file ] [ -G seconds ]\n");

(void)fprintf(stderr,

"\t\t[ -C file_size ] [ -E algo:secret ] [ -F file ] [ -G seconds ]\n");

(void)fprintf(stderr,