"@(#) 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.211 2003-07-31 22:36:43 fenner Exp $ (LBL)";
+ "@(#) $Header: /tcpdump/master/tcpdump/tcpdump.c,v 1.216 2003-11-04 07:29:16 guy Exp $ (LBL)";
#endif
/*
#endif
static void info(int);
+static u_int packets_captured;
/* Length of saved portion of packet. */
int snaplen = DEFAULT_SNAPLEN;
pcap_if_t *devpointer;
int devnum;
#endif
+ int status;
#ifdef WIN32
- DWORD dwVersion;
- DWORD dwWindowsMajorVersion;
- u_int UserBufferSize=1000000;
-#endif
-
-#ifdef WIN32
- dwVersion=GetVersion(); /* get the OS version */
- dwWindowsMajorVersion = (DWORD)(LOBYTE(LOWORD(dwVersion)));
- if(wsockinit()!=0) return 1;
+ u_int UserBufferSize = 1000000;
+ if(wsockinit() != 0) return 1;
#endif /* WIN32 */
cnt = -1;
packettype = PT_CNFP;
else if (strcasecmp(optarg, "tftp") == 0)
packettype = PT_TFTP;
+ else if (strcasecmp(optarg, "aodv") == 0)
+ packettype = PT_AODV;
else
error("unknown packet type `%s'", optarg);
break;
thiszone = gmt2local(0);
if (RFileName != NULL) {
+ int dlt;
+ const char *dlt_name;
+
#ifndef WIN32
/*
* We don't need network access, so relinquish any set-UID
pd = pcap_open_offline(RFileName, ebuf);
if (pd == NULL)
error("%s", ebuf);
- printf("reading from file %s, link-type %u\n",
- RFileName,
- pcap_datalink(pd));
+ dlt = pcap_datalink(pd);
+ dlt_name = pcap_datalink_val_to_name(dlt);
+ if (dlt_name == NULL)
+ dlt_name = "???";
+ printf("reading from file %s, link-type %u (%s)\n",
+ RFileName, dlt, dlt_name);
localnet = 0;
netmask = 0;
if (fflag != 0)
error("%s", ebuf);
}
#ifdef WIN32
- PrintCapBegins(program_name,device);
+ if(IsTextUnicode(device,
+ wcslen((short*)device), // Device always ends with a double \0, so this way to determine its
+ // length should be always valid
+ NULL))
+ {
+ fprintf(stderr, "%s: listening on %ws\n", program_name, device);
+ }
+ else
+ {
+ fprintf(stderr, "%s: listening on %s\n", program_name, device);
+ }
+
+ fflush(stderr);
#endif /* WIN32 */
*ebuf = '\0';
- pd = pcap_open_live(device, snaplen, !pflag, 1000, ebuf);
+ pd = pcap_open_live(device, snaplen, !pflag, 10000, ebuf);
if (pd == NULL)
error("%s", ebuf);
else if (*ebuf)
#endif
#ifndef WIN32
if (RFileName == NULL) {
+ int dlt;
+ const char *dlt_name;
+
if (!vflag && !WFileName) {
(void)fprintf(stderr,
"%s: verbose output suppressed, use -v or -vv for full protocol decode\n",
program_name);
} else
(void)fprintf(stderr, "%s: ", program_name);
- (void)fprintf(stderr, "listening on %s, link-type %u, capture size %u bytes\n",
- device, pcap_datalink(pd), snaplen);
+ dlt = pcap_datalink(pd);
+ dlt_name = pcap_datalink_val_to_name(dlt);
+ if (dlt_name == NULL)
+ dlt_name = "???";
+ (void)fprintf(stderr, "listening on %s, link-type %u (%s), capture size %u bytes\n",
+ device, dlt, dlt_name, snaplen);
(void)fflush(stderr);
}
#endif /* WIN32 */
- if (pcap_loop(pd, cnt, callback, pcap_userdata) < 0) {
+ status = pcap_loop(pd, cnt, callback, pcap_userdata);
+ if (WFileName == NULL) {
+ /*
+ * We're printing packets. Flush the printed output,
+ * so it doesn't get intermingled with error output.
+ */
+ if (status == -2) {
+ /*
+ * We got interrupted, so perhaps we didn't
+ * manage to finish a line we were printing.
+ * Print an extra newline, just in case.
+ */
+ putchar('\n');
+ }
+ (void)fflush(stdout);
+ }
+ if (status == -1) {
+ /*
+ * Error. Report it.
+ */
(void)fprintf(stderr, "%s: pcap_loop: %s\n",
program_name, pcap_geterr(pd));
- cleanup(0);
- pcap_close(pd);
- exit(1);
}
- if (RFileName == NULL)
+ if (RFileName == NULL) {
+ /*
+ * We're doing a live capture. Report the capture
+ * statistics.
+ */
info(1);
+ }
pcap_close(pd);
- exit(0);
+ exit(status == -1 ? 1 : 0);
}
/* make a clean exit on interrupts */
static RETSIGTYPE
-cleanup(int signo)
+cleanup(int signo _U_)
{
-
- /* Can't print the summary if reading from a savefile */
+#ifdef HAVE_PCAP_BREAKLOOP
+ /*
+ * We have "pcap_breakloop()"; use it, so that we do as little
+ * as possible in the signal handler (it's probably not safe
+ * to do anything with standard I/O streams in a signal handler -
+ * the ANSI C standard doesn't say it is).
+ */
+ pcap_breakloop(pd);
+#else
+ /*
+ * We don't have "pcap_breakloop()"; this isn't safe, but
+ * it's the best we can do. Print the summary if we're
+ * not reading from a savefile - i.e., if we're doing a
+ * live capture - and exit.
+ */
if (pd != NULL && pcap_file(pd) == NULL) {
+ /*
+ * We got interrupted, so perhaps we didn't
+ * manage to finish a line we were printing.
+ * Print an extra newline, just in case.
+ */
+ putchar('\n');
(void)fflush(stdout);
- putc('\n', stderr);
info(1);
}
- if (signo)
- exit(0);
+ exit(0);
+#endif
}
static void
if (!verbose)
fprintf(stderr, "%s: ", program_name);
+ (void)fprintf(stderr, "%u packets captured", packets_captured);
+ if (!verbose)
+ fputs(", ", stderr);
+ else
+ putc('\n', stderr);
(void)fprintf(stderr, "%d packets received by filter", stat.ps_recv);
if (!verbose)
fputs(", ", stderr);
static uint cnt = 2;
char *name;
+ ++packets_captured;
+
++infodelay;
dump_info = (struct dump_info *)user;
static void
dump_packet(u_char *user, const struct pcap_pkthdr *h, const u_char *sp)
{
+ ++packets_captured;
+
++infodelay;
pcap_dump(user, h, sp);
struct print_info *print_info;
u_int hdrlen;
+ ++packets_captured;
+
++infodelay;
ts_print(&h->ts);
projects / tcpdump / blobdiff