#include <signal.h>
#include <errno.h>
+#include <setjmp.h>
#include <glib.h>
#include <pcap.h>
-#include "pcap-util.h"
+
+#include "pcapio.h"
+
+#include "capture-pcap-util.h"
#include "capture.h"
-#include "capture_loop.h"
#include "capture_sync.h"
#include "conditions.h"
#include "capture_stop_conditions.h"
#include "ringbuffer.h"
-#include "wiretap/libpcap.h"
-#include "wiretap/wtap.h"
-#include "wiretap/wtap-capture.h"
-
#include "simple_dialog.h"
-#include "util.h"
+#include "tempfile.h"
#include "log.h"
#include "file_util.h"
-
+#include "capture_loop.h"
/*
- * We don't want to do a "select()" on the pcap_t's file descriptor on
- * BSD (because "select()" doesn't work correctly on BPF devices on at
- * least some releases of some flavors of BSD), and we don't want to do
- * it on Windows (because "select()" is something for sockets, not for
- * arbitrary handles). (Note that "Windows" here includes Cygwin;
- * even in its pretend-it's-UNIX environment, we're using WinPcap, not
- * a UNIX libpcap.)
- *
- * We *do* want to do it on other platforms, as, on other platforms (with
- * the possible exception of Ultrix and Digital UNIX), the read timeout
- * doesn't expire if no packets have arrived, so a "pcap_dispatch()" call
- * will block until packets arrive, causing the UI to hang.
- *
- * XXX - the various BSDs appear to define BSD in <sys/param.h>; we don't
- * want to include it if it's not present on this platform, however.
+ * Standard secondary message for unexpected errors.
*/
-#if !defined(__FreeBSD__) && !defined(__NetBSD__) && !defined(__OpenBSD__) && \
- !defined(__bsdi__) && !defined(__APPLE__) && !defined(_WIN32) && \
- !defined(__CYGWIN__)
-# define MUST_DO_SELECT
-#endif
-
-
-typedef struct _loop_data {
- /* common */
- gboolean go; /* TRUE as long as we're supposed to keep capturing */
- int err; /* if non-zero, error seen while capturing */
- gint packets_curr; /* Number of packets we have already captured */
- gint packets_max; /* Number of packets we're supposed to capture - 0 means infinite */
- gint packets_sync_pipe; /* packets not already send out to the sync_pipe */
-
- /* pcap "input file" */
- pcap_t *pcap_h; /* pcap handle */
- gboolean pcap_err; /* TRUE if error from pcap */
-#ifdef MUST_DO_SELECT
- int pcap_fd; /* pcap file descriptor */
-#endif
-
- /* capture pipe (unix only "input file") */
- gboolean from_cap_pipe; /* TRUE if we are capturing data from a capture pipe */
-#ifndef _WIN32
- struct pcap_hdr cap_pipe_hdr;
- struct pcaprec_modified_hdr cap_pipe_rechdr;
- int cap_pipe_fd; /* the file descriptor of the capture pipe */
- gboolean cap_pipe_modified; /* TRUE if data in the pipe uses modified pcap headers */
- gboolean cap_pipe_byte_swapped; /* TRUE if data in the pipe is byte swapped */
- unsigned int cap_pipe_bytes_to_read;/* Used by cap_pipe_dispatch */
- unsigned int cap_pipe_bytes_read; /* Used by cap_pipe_dispatch */
- enum {
- STATE_EXPECT_REC_HDR,
- STATE_READ_REC_HDR,
- STATE_EXPECT_DATA,
- STATE_READ_DATA
- } cap_pipe_state;
-
- enum { PIPOK, PIPEOF, PIPERR, PIPNEXIST } cap_pipe_err;
-#endif
+static const char please_report[] =
+ "Please report this to the Ethereal developers";
- /* wiretap (output file) */
- wtap_dumper *wtap_pdh;
- gint wtap_linktype;
-
-} loop_data;
+/*
+ * This needs to be static, so that the SIGUSR1 handler can clear the "go"
+ * flag.
+ */
+static loop_data ld;
/*
/* Take care of byte order in the libpcap headers read from pipes.
* (function taken from wiretap/libpcap.c) */
static void
-cap_pipe_adjust_header(loop_data *ld, struct pcap_hdr *hdr, struct pcaprec_hdr *rechdr)
+cap_pipe_adjust_header(gboolean byte_swapped, struct pcap_hdr *hdr, struct pcaprec_hdr *rechdr)
{
- if (ld->cap_pipe_byte_swapped) {
+ if (byte_swapped) {
/* Byte-swap the record header fields. */
rechdr->ts_sec = BSWAP32(rechdr->ts_sec);
rechdr->ts_usec = BSWAP32(rechdr->ts_usec);
g_log(LOG_DOMAIN_CAPTURE_CHILD, G_LOG_LEVEL_DEBUG, "cap_pipe_open_live: %s", pipename);
/*
- * XXX Ethereal blocks until we return
+ * XXX (T)Ethereal blocks until we return
*/
if (strcmp(pipename, "-") == 0)
fd = 0; /* read from stdin */
hdr->snaplen = BSWAP32(hdr->snaplen);
hdr->network = BSWAP32(hdr->network);
}
+ ld->linktype = hdr->network;
if (hdr->version_major < 2) {
g_snprintf(errmsg, errmsgl, "Unable to read old libpcap format");
/* We read one record from the pipe, take care of byte order in the record
* header, write the record to the capture file, and update capture statistics. */
-static int
-cap_pipe_dispatch(int fd, loop_data *ld, struct pcap_hdr *hdr,
- struct pcaprec_modified_hdr *rechdr, guchar *data,
- char *errmsg, int errmsgl)
+int
+cap_pipe_dispatch(loop_data *ld, guchar *data, char *errmsg, int errmsgl)
{
struct pcap_pkthdr phdr;
int b;
/* Fall through */
case STATE_READ_REC_HDR:
- b = read(fd, ((char *)rechdr)+ld->cap_pipe_bytes_read,
- ld->cap_pipe_bytes_to_read - ld->cap_pipe_bytes_read);
+ b = read(ld->cap_pipe_fd, ((char *)&ld->cap_pipe_rechdr)+ld->cap_pipe_bytes_read,
+ ld->cap_pipe_bytes_to_read - ld->cap_pipe_bytes_read);
if (b <= 0) {
if (b == 0)
result = PD_PIPE_EOF;
/* Fall through */
case STATE_READ_DATA:
- b = read(fd, data+ld->cap_pipe_bytes_read, rechdr->hdr.incl_len - ld->cap_pipe_bytes_read);
+ b = read(ld->cap_pipe_fd, data+ld->cap_pipe_bytes_read,
+ ld->cap_pipe_rechdr.hdr.incl_len - ld->cap_pipe_bytes_read);
if (b <= 0) {
if (b == 0)
result = PD_PIPE_EOF;
result = PD_PIPE_ERR;
break;
}
- if ((ld->cap_pipe_bytes_read += b) < rechdr->hdr.incl_len)
+ if ((ld->cap_pipe_bytes_read += b) < ld->cap_pipe_rechdr.hdr.incl_len)
return 0;
result = PD_DATA_READ;
break;
case PD_REC_HDR_READ:
/* We've read the header. Take care of byte order. */
- cap_pipe_adjust_header(ld, hdr, &rechdr->hdr);
- if (rechdr->hdr.incl_len > WTAP_MAX_PACKET_SIZE) {
+ cap_pipe_adjust_header(ld->cap_pipe_byte_swapped, &ld->cap_pipe_hdr,
+ &ld->cap_pipe_rechdr.hdr);
+ if (ld->cap_pipe_rechdr.hdr.incl_len > WTAP_MAX_PACKET_SIZE) {
g_snprintf(errmsg, errmsgl, "Frame %u too long (%d bytes)",
- ld->packets_curr+1, rechdr->hdr.incl_len);
+ ld->packet_count+1, ld->cap_pipe_rechdr.hdr.incl_len);
break;
}
ld->cap_pipe_state = STATE_EXPECT_DATA;
case PD_DATA_READ:
/* Fill in a "struct pcap_pkthdr", and process the packet. */
- phdr.ts.tv_sec = rechdr->hdr.ts_sec;
- phdr.ts.tv_usec = rechdr->hdr.ts_usec;
- phdr.caplen = rechdr->hdr.incl_len;
- phdr.len = rechdr->hdr.orig_len;
+ phdr.ts.tv_sec = ld->cap_pipe_rechdr.hdr.ts_sec;
+ phdr.ts.tv_usec = ld->cap_pipe_rechdr.hdr.ts_usec;
+ phdr.caplen = ld->cap_pipe_rechdr.hdr.incl_len;
+ phdr.len = ld->cap_pipe_rechdr.hdr.orig_len;
- capture_loop_packet_cb((u_char *)ld, &phdr, data);
+ ld->packet_cb((u_char *)ld, &phdr, data);
ld->cap_pipe_state = STATE_EXPECT_REC_HDR;
return 1;
/* open the capture input file (pcap or capture pipe) */
-static int capture_loop_open_input(capture_options *capture_opts, loop_data *ld, char *errmsg, int errmsg_len) {
+gboolean
+capture_loop_open_input(capture_options *capture_opts, loop_data *ld,
+ char *errmsg, size_t errmsg_len,
+ char *secondary_errmsg, size_t secondary_errmsg_len)
+{
gchar open_err_str[PCAP_ERRBUF_SIZE];
+ gchar *sync_msg_str;
+#ifdef _WIN32
+ gchar *sync_secondary_msg_str;
+#endif
const char *set_linktype_err_str;
#ifdef _WIN32
int err;
g_log(LOG_DOMAIN_CAPTURE_CHILD, G_LOG_LEVEL_DEBUG, "capture_loop_open_input : %s", capture_opts->iface);
+
+/* XXX - opening Winsock on tethereal? */
+
/* Initialize Windows Socket if we are in a WIN32 OS
This needs to be done before querying the interface for network/netmask */
#ifdef _WIN32
"Couldn't initialize Windows Sockets: error %d", err);
break;
}
+ g_snprintf(secondary_errmsg, secondary_errmsg_len, please_report);
return FALSE;
}
#endif
#ifdef _WIN32
/* try to set the capture buffer size */
if (pcap_setbuff(ld->pcap_h, capture_opts->buffer_size * 1024 * 1024) != 0) {
- simple_dialog(ESD_TYPE_INFO, ESD_BTN_OK,
- "%sCouldn't set the capture buffer size!%s\n"
- "\n"
+ sync_secondary_msg_str = g_strdup_printf(
"The capture buffer size of %luMB seems to be too high for your machine,\n"
"the default of 1MB will be used.\n"
"\n"
"Nonetheless, the capture is started.\n",
- simple_dialog_primary_start(), simple_dialog_primary_end(), capture_opts->buffer_size);
+ capture_opts->buffer_size);
+ report_capture_error("Couldn't set the capture buffer size!",
+ sync_secondary_msg_str);
+ g_free(sync_secondary_msg_str);
}
#endif
capture_opts->linktype);
if (set_linktype_err_str != NULL) {
g_snprintf(errmsg, errmsg_len, "Unable to set data link type (%s).",
- set_linktype_err_str);
+ set_linktype_err_str);
+ g_snprintf(secondary_errmsg, secondary_errmsg_len, please_report);
return FALSE;
}
}
+ ld->linktype = get_pcap_linktype(ld->pcap_h, capture_opts->iface);
} else {
/* We couldn't open "iface" as a network device. */
#ifdef _WIN32
/* On Win32 OSes, the capture devices are probably available to all
users; don't warn about permissions problems.
- Do, however, warn that WAN devices aren't supported. */
+ Do, however, warn about the lack of 64-bit support, and warn that
+ WAN devices aren't supported. */
g_snprintf(errmsg, errmsg_len,
-"%sThe capture session could not be initiated!%s\n"
-"\n"
-"(%s)\n"
+"The capture session could not be initiated.\n"
+"\"%s\"",
+ open_err_str);
+ g_snprintf(secondary_errmsg, secondary_errmsg_len,
"\n"
-"Please check that you have the proper interface specified.\n"
+"Please check that \"%s\" is the proper interface.\n"
"\n"
"\n"
"Help can be found at:\n"
"\n"
-" %shttp://wiki.ethereal.com/CaptureSetup%s\n"
+" http://wiki.ethereal.com/CaptureSetup\n"
"\n"
"64-bit Windows:\n"
-"WinPcap does not support 64-bit Windows, you will have to use some other\n"
+"WinPcap does not support 64-bit Windows; you will have to use some other\n"
"tool to capture traffic, such as netcap.\n"
"For netcap details see: http://support.microsoft.com/?id=310875\n"
"\n"
"Server 2003.\n"
"WinPcap 3.1 has support for it on Windows 2000 / XP / Server 2003, but has no\n"
"support for it on Windows NT 4.0 or Windows Vista (Beta 1).",
- simple_dialog_primary_start(), simple_dialog_primary_end(),
- open_err_str,
- simple_dialog_primary_start(), simple_dialog_primary_end());
+ capture_opts->iface);
return FALSE;
#else
/* try to open iface as a pipe */
if (ld->cap_pipe_err == PIPNEXIST) {
/* Pipe doesn't exist, so output message for interface */
- /* If we got a "can't find PPA for XXX" message, warn the user (who
- is running Ethereal on HP-UX) that they don't have a version
+ /* If we got a "can't find PPA for X" message, warn the user (who
+ is running (T)Ethereal on HP-UX) that they don't have a version
of libpcap that properly handles HP-UX (libpcap 0.6.x and later
versions, which properly handle HP-UX, say "can't find /dev/dlpi
- PPA for XXX" rather than "can't find PPA for XXX"). */
+ PPA for X" rather than "can't find PPA for X"). */
if (strncmp(open_err_str, ppamsg, sizeof ppamsg - 1) == 0)
libpcap_warn =
"\n\n"
- "You are running Ethereal with a version of the libpcap library\n"
+ "You are running (T)Ethereal with a version of the libpcap library\n"
"that doesn't handle HP-UX network devices well; this means that\n"
- "Ethereal may not be able to capture packets.\n"
+ "(T)Ethereal may not be able to capture packets.\n"
"\n"
"To fix this, you should install libpcap 0.6.2, or a later version\n"
"of libpcap, rather than libpcap 0.4 or 0.5.x. It is available in\n"
else
libpcap_warn = "";
g_snprintf(errmsg, errmsg_len,
- "The capture session could not be initiated (%s).\n"
- "Please check to make sure you have sufficient permissions, and that\n"
- "you have the proper interface or pipe specified.%s", open_err_str,
- libpcap_warn);
+ "The capture session could not be initiated (%s).", open_err_str);
+ g_snprintf(secondary_errmsg, secondary_errmsg_len,
+"Please check to make sure you have sufficient permissions, and that you have\n"
+"the proper interface or pipe specified.%s", libpcap_warn);
}
/*
* Else pipe (or file) does exist and cap_pipe_open_live() has
#endif
}
+/* XXX - will this work for tethereal? */
#ifdef MUST_DO_SELECT
if (!ld->from_cap_pipe) {
#ifdef HAVE_PCAP_GET_SELECTABLE_FD
/* Does "open_err_str" contain a non-empty string? If so, "pcap_open_live()"
returned a warning; print it, but keep capturing. */
- if (open_err_str[0] != '\0')
- g_warning("%s.", open_err_str);
+ if (open_err_str[0] != '\0') {
+ sync_msg_str = g_strdup_printf("%s.", open_err_str);
+ report_capture_error(sync_msg_str, "");
+ g_free(sync_msg_str);
+ }
return TRUE;
}
-/* open the capture input file (pcap or capture pipe) */
+/* close the capture input file (pcap or capture pipe) */
static void capture_loop_close_input(loop_data *ld) {
g_log(LOG_DOMAIN_CAPTURE_CHILD, G_LOG_LEVEL_DEBUG, "capture_loop_close_input");
/* init the capture filter */
-static int capture_loop_init_filter(loop_data *ld, const gchar * iface, gchar * cfilter, char *errmsg, int errmsg_len) {
+initfilter_status_t capture_loop_init_filter(pcap_t *pcap_h, gboolean from_cap_pipe, const gchar * iface, gchar * cfilter) {
bpf_u_int32 netnum, netmask;
gchar lookup_net_err_str[PCAP_ERRBUF_SIZE];
struct bpf_program fcode;
g_log(LOG_DOMAIN_CAPTURE_CHILD, G_LOG_LEVEL_DEBUG, "capture_loop_init_filter: %s", cfilter);
/* capture filters only work on real interfaces */
- if (cfilter && !ld->from_cap_pipe) {
+ if (cfilter && !from_cap_pipe) {
/* A capture filter was specified; set it up. */
if (pcap_lookupnet(iface, &netnum, &netmask, lookup_net_err_str) < 0) {
/*
* a difference (only filters that check for IP broadcast addresses
* use the netmask).
*/
+ /*cmdarg_err(
+ "Warning: Couldn't obtain netmask info (%s).", lookup_net_err_str);*/
netmask = 0;
}
- if (pcap_compile(ld->pcap_h, &fcode, cfilter, 1, netmask) < 0) {
- dfilter_t *rfcode = NULL;
- gchar *safe_cfilter = simple_dialog_format_message(cfilter);
- gchar *safe_cfilter_error_msg = simple_dialog_format_message(
- pcap_geterr(ld->pcap_h));
-
- /* filter string invalid, did the user tried a display filter? */
-#ifndef DUMPCAP
- if (dfilter_compile(cfilter, &rfcode) && rfcode != NULL) {
- g_snprintf(errmsg, errmsg_len,
- "%sInvalid capture filter: \"%s\"!%s\n"
- "\n"
- "That string looks like a valid display filter; however, it isn't a valid\n"
- "capture filter (%s).\n"
- "\n"
- "Note that display filters and capture filters don't have the same syntax,\n"
- "so you can't use most display filter expressions as capture filters.\n"
- "\n"
- "See the help for a description of the capture filter syntax.",
- simple_dialog_primary_start(), safe_cfilter,
- simple_dialog_primary_end(), safe_cfilter_error_msg);
- dfilter_free(rfcode);
- } else
-#endif
- {
- g_snprintf(errmsg, errmsg_len,
- "%sInvalid capture filter: \"%s\"!%s\n"
- "\n"
- "That string isn't a valid capture filter (%s).\n"
- "See the help for a description of the capture filter syntax.",
- simple_dialog_primary_start(), safe_cfilter,
- simple_dialog_primary_end(), safe_cfilter_error_msg);
- }
- g_free(safe_cfilter_error_msg);
- g_free(safe_cfilter);
- return FALSE;
+ if (pcap_compile(pcap_h, &fcode, cfilter, 1, netmask) < 0) {
+ /* Treat this specially - our caller might try to compile this
+ as a display filter and, if that succeeds, warn the user that
+ the display and capture filter syntaxes are different. */
+ return INITFILTER_BAD_FILTER;
}
- if (pcap_setfilter(ld->pcap_h, &fcode) < 0) {
- g_snprintf(errmsg, errmsg_len, "Can't install filter (%s).",
- pcap_geterr(ld->pcap_h));
+ if (pcap_setfilter(pcap_h, &fcode) < 0) {
#ifdef HAVE_PCAP_FREECODE
pcap_freecode(&fcode);
#endif
- return FALSE;
+ return INITFILTER_OTHER_ERROR;
}
#ifdef HAVE_PCAP_FREECODE
pcap_freecode(&fcode);
#endif
}
- return TRUE;
+ return INITFILTER_NO_ERROR;
}
-/* open the wiretap part of the capture output file */
-static int capture_loop_init_wiretap_output(capture_options *capture_opts, int save_file_fd, loop_data *ld, char *errmsg, int errmsg_len) {
- int pcap_encap;
+/* set up to write to the already-opened capture output file/files */
+gboolean capture_loop_init_output(capture_options *capture_opts, int save_file_fd, loop_data *ld, char *errmsg, int errmsg_len) {
int file_snaplen;
int err;
- g_log(LOG_DOMAIN_CAPTURE_CHILD, G_LOG_LEVEL_DEBUG, "capture_loop_init_wiretap_output");
+ g_log(LOG_DOMAIN_CAPTURE_CHILD, G_LOG_LEVEL_DEBUG, "capture_loop_init_output");
- /* get packet encapsulation type and snaplen */
+ /* get snaplen */
#ifndef _WIN32
if (ld->from_cap_pipe) {
- pcap_encap = ld->cap_pipe_hdr.network;
file_snaplen = ld->cap_pipe_hdr.snaplen;
} else
#endif
{
- pcap_encap = get_pcap_linktype(ld->pcap_h, capture_opts->iface);
file_snaplen = pcap_snapshot(ld->pcap_h);
}
/* Set up to write to the capture file. */
- ld->wtap_linktype = wtap_pcap_encap_to_wtap_encap(pcap_encap);
- if (ld->wtap_linktype == WTAP_ENCAP_UNKNOWN) {
- g_snprintf(errmsg, errmsg_len,
- "The network you're capturing from is of a type"
- " that Ethereal doesn't support (data link type %d).", pcap_encap);
- return FALSE;
- }
if (capture_opts->multi_files_on) {
- ld->wtap_pdh = ringbuf_init_wtap_dump_fdopen(WTAP_FILE_PCAP, ld->wtap_linktype,
- file_snaplen, &err);
+ ld->pdh = ringbuf_init_libpcap_fdopen(ld->linktype, file_snaplen,
+ &ld->bytes_written, &err);
} else {
- ld->wtap_pdh = wtap_dump_fdopen(save_file_fd, WTAP_FILE_PCAP,
- ld->wtap_linktype, file_snaplen, FALSE /* compressed */, &err);
+ ld->pdh = libpcap_fdopen(save_file_fd, ld->linktype, file_snaplen,
+ &ld->bytes_written, &err);
}
- if (ld->wtap_pdh == NULL) {
+ if (ld->pdh == NULL) {
/* We couldn't set up to write to the capture file. */
+ /* XXX - use cf_open_error_message from tethereal instead? */
switch (err) {
case WTAP_ERR_CANT_OPEN:
return TRUE;
}
-static gboolean capture_loop_close_output(capture_options *capture_opts, loop_data *ld, int *err_close) {
+gboolean capture_loop_close_output(capture_options *capture_opts, loop_data *ld, int *err_close) {
g_log(LOG_DOMAIN_CAPTURE_CHILD, G_LOG_LEVEL_DEBUG, "capture_loop_close_output");
if (capture_opts->multi_files_on) {
- return ringbuf_wtap_dump_close(&capture_opts->save_file, err_close);
+ return ringbuf_libpcap_dump_close(&capture_opts->save_file, err_close);
} else {
- return wtap_dump_close(ld->wtap_pdh, err_close);
+ return libpcap_dump_close(ld->pdh, err_close);
}
}
/* dispatch incoming packets (pcap or capture pipe) */
static int
-capture_loop_dispatch(capture_options *capture_opts, loop_data *ld,
+capture_loop_dispatch(capture_options *capture_opts _U_, loop_data *ld,
char *errmsg, int errmsg_len) {
int inpkts;
#ifndef _WIN32
if (sel_ret < 0 && errno != EINTR) {
g_snprintf(errmsg, errmsg_len,
"Unexpected error from select: %s", strerror(errno));
- sync_pipe_errmsg_to_parent(errmsg);
+ report_capture_error(errmsg, please_report);
ld->go = FALSE;
}
} else {
/*
* "select()" says we can read from the pipe without blocking
*/
- inpkts = cap_pipe_dispatch(ld->cap_pipe_fd, ld, &ld->cap_pipe_hdr, &ld->cap_pipe_rechdr, pcap_data,
- errmsg, errmsg_len);
+ inpkts = cap_pipe_dispatch(ld, pcap_data, errmsg, errmsg_len);
if (inpkts < 0) {
ld->go = FALSE;
}
* "select()" says we can read from it without blocking; go for
* it.
*/
- inpkts = pcap_dispatch(ld->pcap_h, 1, capture_loop_packet_cb, (u_char *)ld);
+ inpkts = pcap_dispatch(ld->pcap_h, 1, ld->packet_cb, (u_char *)ld);
if (inpkts < 0) {
ld->pcap_err = TRUE;
ld->go = FALSE;
if (sel_ret < 0 && errno != EINTR) {
g_snprintf(errmsg, errmsg_len,
"Unexpected error from select: %s", strerror(errno));
- sync_pipe_errmsg_to_parent(errmsg);
+ report_capture_error(errmsg, please_report);
ld->go = FALSE;
}
}
#ifdef LOG_CAPTURE_VERBOSE
g_log(LOG_DOMAIN_CAPTURE_CHILD, G_LOG_LEVEL_DEBUG, "capture_loop_dispatch: from pcap_dispatch");
#endif
- inpkts = pcap_dispatch(ld->pcap_h, 1, capture_loop_packet_cb, (u_char *) ld);
+ inpkts = pcap_dispatch(ld->pcap_h, 1, ld->packet_cb, (u_char *) ld);
if (inpkts < 0) {
ld->pcap_err = TRUE;
ld->go = FALSE;
inpkts = 0;
while( (in = pcap_next_ex(ld->pcap_h, &pkt_header, &pkt_data)) == 1) {
- capture_loop_packet_cb( (u_char *) ld, pkt_header, pkt_data);
+ ld->packet_cb( (u_char *) ld, pkt_header, pkt_data);
inpkts++;
}
}
-/* open the output file (temporary/specified name/ringbuffer) */
+/* open the output file (temporary/specified name/ringbuffer/named pipe/stdout) */
/* Returns TRUE if the file opened successfully, FALSE otherwise. */
-static gboolean
+gboolean
capture_loop_open_output(capture_options *capture_opts, int *save_file_fd,
char *errmsg, int errmsg_len) {
* case the caller destroys it after we return.
*/
capfile_name = g_strdup(capture_opts->save_file);
- if (capture_opts->multi_files_on) {
- /* ringbuffer is enabled */
- *save_file_fd = ringbuf_init(capfile_name,
- (capture_opts->has_ring_num_files) ? capture_opts->ring_num_files : 0);
-
- /* we need the ringbuf name */
- if(*save_file_fd != -1) {
- g_free(capfile_name);
- capfile_name = g_strdup(ringbuf_current_filename());
+ if (strcmp(capfile_name, "-") == 0) {
+ /* Write to the standard output. */
+ if (capture_opts->multi_files_on) {
+ /* ringbuffer is enabled; that doesn't work with standard output */
+ g_snprintf(errmsg, errmsg_len,
+ "Ring buffer requested, but capture is being written to the standard output.");
+ g_free(capfile_name);
+ return FALSE;
+ } else {
+ *save_file_fd = 1;
}
} else {
- /* Try to open/create the specified file for use as a capture buffer. */
- *save_file_fd = open(capfile_name, O_RDWR|O_BINARY|O_TRUNC|O_CREAT,
- 0600);
+ if (capture_opts->multi_files_on) {
+ /* ringbuffer is enabled */
+ *save_file_fd = ringbuf_init(capfile_name,
+ (capture_opts->has_ring_num_files) ? capture_opts->ring_num_files : 0);
+
+ /* we need the ringbuf name */
+ if(*save_file_fd != -1) {
+ g_free(capfile_name);
+ capfile_name = g_strdup(ringbuf_current_filename());
+ }
+ } else {
+ /* Try to open/create the specified file for use as a capture buffer. */
+ *save_file_fd = open(capfile_name, O_RDWR|O_BINARY|O_TRUNC|O_CREAT,
+ 0600);
+ }
}
is_tempfile = FALSE;
} else {
static void
capture_loop_stop_signal_handler(int signo _U_)
{
+ g_log(LOG_DOMAIN_CAPTURE_CHILD, G_LOG_LEVEL_INFO, "Signal: Stop capture");
capture_loop_stop();
}
#endif
#define TIME_GET() time(NULL)
#endif
-#ifdef _WIN32
-static gboolean
-signal_pipe_stopped(void)
-{
- /* some news from our parent (signal pipe)? -> just stop the capture */
- HANDLE handle;
- DWORD avail = 0;
- gboolean result;
-
-
- handle = (HANDLE) _get_osfhandle (0);
- result = PeekNamedPipe(handle, NULL, 0, NULL, &avail, NULL);
-
- /*g_warning("check pipe: handle: %x result: %u avail: %u", handle, result, avail);*/
-
- if(!result || avail > 0) {
- /* XXX - doesn't work with dumpcap as a command line tool */
- /* as we have no input pipe, need to find a way to circumvent this */
- return TRUE;
- }
-
- return FALSE;
-}
-#endif
-
-
-/*
- * This needs to be static, so that the SIGUSR1 handler can clear the "go"
- * flag.
- */
-static loop_data ld;
-
/* Do the low-level work of a capture.
Returns TRUE if it succeeds, FALSE otherwise. */
int
{
time_t upd_time, cur_time;
time_t start_time;
- int err_close, inpkts;
+ int err_close;
+ int inpkts;
+ gint inpkts_to_sync_pipe = 0; /* packets not already send out to the sync_pipe */
condition *cnd_file_duration = NULL;
condition *cnd_autostop_files = NULL;
condition *cnd_autostop_size = NULL;
guint32 autostop_files = 0;
gboolean write_ok;
gboolean close_ok;
+ gboolean cfilter_error = FALSE;
char errmsg[4096+1];
- int save_file_fd;
-#ifdef _WIN32
- gboolean signal_pipe_enabled;
-#endif
+ char secondary_errmsg[4096+1];
+ int save_file_fd = -1;
/* init the loop data */
ld.go = TRUE;
- ld.packets_curr = 0;
+ ld.packet_count = 0;
if (capture_opts->has_autostop_packets)
- ld.packets_max = capture_opts->autostop_packets;
+ ld.packet_max = capture_opts->autostop_packets;
else
- ld.packets_max = 0; /* no limit */
+ ld.packet_max = 0; /* no limit */
ld.err = 0; /* no error seen yet */
ld.wtap_linktype = WTAP_ENCAP_UNKNOWN;
ld.pcap_err = FALSE;
ld.from_cap_pipe = FALSE;
- ld.packets_sync_pipe = 0;
- ld.wtap_pdh = NULL;
+ ld.pdh = NULL;
#ifndef _WIN32
ld.cap_pipe_fd = -1;
#endif
#ifdef MUST_DO_SELECT
ld.pcap_fd = 0;
#endif
+ ld.packet_cb = capture_loop_packet_cb;
+
/* We haven't yet gotten the capture statistics. */
*stats_known = FALSE;
* Catch SIGUSR1, so that we exit cleanly if the parent process
* kills us with it due to the user selecting "Capture->Stop".
*/
- signal(SIGUSR1, capture_loop_stop_signal_handler);
+ signal(SIGUSR1, capture_loop_stop_signal_handler);
#endif
- /* get the initial state of the signal pipe */
- /* (if it's already stopped here, ignore it later) */
- signal_pipe_enabled = !signal_pipe_stopped();
-
- g_log(LOG_DOMAIN_CAPTURE_CHILD, G_LOG_LEVEL_INFO, "Capture child starting ...");
+ g_log(LOG_DOMAIN_CAPTURE_CHILD, G_LOG_LEVEL_INFO, "Capture loop starting ...");
capture_opts_log(LOG_DOMAIN_CAPTURE_CHILD, G_LOG_LEVEL_DEBUG, capture_opts);
- /* open the output file (temporary/specified name/ringbuffer) */
- if (!capture_loop_open_output(capture_opts, &save_file_fd, errmsg, sizeof(errmsg))) {
- goto error;
- }
-
/* open the "input file" from network interface or capture pipe */
- if (!capture_loop_open_input(capture_opts, &ld, errmsg, sizeof(errmsg))) {
+ if (!capture_loop_open_input(capture_opts, &ld, errmsg, sizeof(errmsg),
+ secondary_errmsg, sizeof(secondary_errmsg))) {
goto error;
}
/* init the input filter from the network interface (capture pipe will do nothing) */
- if (!capture_loop_init_filter(&ld, capture_opts->iface, capture_opts->cfilter, errmsg, sizeof(errmsg))) {
+ switch (capture_loop_init_filter(ld.pcap_h, ld.from_cap_pipe, capture_opts->iface, capture_opts->cfilter)) {
+
+ case INITFILTER_NO_ERROR:
+ break;
+
+ case INITFILTER_BAD_FILTER:
+ cfilter_error = TRUE;
+ g_snprintf(errmsg, sizeof(errmsg), "%s", pcap_geterr(ld.pcap_h));
+ *secondary_errmsg = '\0';
goto error;
- }
- /* open the wiretap part of the output file (the output file is already open) */
- if (!capture_loop_init_wiretap_output(capture_opts, save_file_fd, &ld, errmsg, sizeof(errmsg))) {
+ case INITFILTER_OTHER_ERROR:
+ g_snprintf(errmsg, sizeof(errmsg), "Can't install filter (%s).",
+ pcap_geterr(ld.pcap_h));
+ g_snprintf(secondary_errmsg, sizeof(secondary_errmsg), "%s", please_report);
goto error;
}
+ /* If we're supposed to write to a capture file, open it for output
+ (temporary/specified name/ringbuffer) */
+ if (capture_opts->saving_to_file) {
+ if (!capture_loop_open_output(capture_opts, &save_file_fd, errmsg, sizeof(errmsg))) {
+ *secondary_errmsg = '\0';
+ goto error;
+ }
+
+ /* set up to write to the already-opened capture output file/files */
+ if (!capture_loop_init_output(capture_opts, save_file_fd, &ld, errmsg, sizeof(errmsg))) {
+ *secondary_errmsg = '\0';
+ goto error;
+ }
+
/* XXX - capture SIGTERM and close the capture, in case we're on a
Linux 2.0[.x] system and you have to explicitly close the capture
stream in order to turn promiscuous mode off? We need to do that
in other places as well - and I don't think that works all the
time in any case, due to libpcap bugs. */
- /* Well, we should be able to start capturing.
+ /* Well, we should be able to start capturing.
- Sync out the capture file, so the header makes it to the file system,
- and send a "capture started successfully and capture file created"
- message to our parent so that they'll open the capture file and
- update its windows to indicate that we have a live capture in
- progress. */
- wtap_dump_flush(ld.wtap_pdh);
- sync_pipe_filename_to_parent(capture_opts->save_file);
+ Sync out the capture file, so the header makes it to the file system,
+ and send a "capture started successfully and capture file created"
+ message to our parent so that they'll open the capture file and
+ update its windows to indicate that we have a live capture in
+ progress. */
+ libpcap_dump_flush(ld.pdh, NULL);
+ report_new_capture_file(capture_opts->save_file);
+ }
/* initialize capture stop (and alike) conditions */
init_capture_stop_conditions();
start_time = TIME_GET();
upd_time = TIME_GET();
- g_log(LOG_DOMAIN_CAPTURE_CHILD, G_LOG_LEVEL_INFO, "Capture child running!");
+ g_log(LOG_DOMAIN_CAPTURE_CHILD, G_LOG_LEVEL_INFO, "Capture loop running!");
/* WOW, everything is prepared! */
/* please fasten your seat belts, we will enter now the actual capture loop */
inpkts = capture_loop_dispatch(capture_opts, &ld, errmsg, sizeof(errmsg));
#ifdef _WIN32
- /* some news from our parent (signal pipe)? -> just stop the capture */
- if (signal_pipe_stopped() && signal_pipe_enabled) {
+ /* any news from our parent (signal pipe)? -> just stop the capture */
+ if (!signal_pipe_check_running()) {
ld.go = FALSE;
}
#endif
if (inpkts > 0) {
- ld.packets_sync_pipe += inpkts;
+ inpkts_to_sync_pipe += inpkts;
/* check capture size condition */
- if (cnd_autostop_size != NULL && cnd_eval(cnd_autostop_size,
- (guint32)wtap_get_bytes_dumped(ld.wtap_pdh))){
+ if (cnd_autostop_size != NULL &&
+ cnd_eval(cnd_autostop_size, (guint32)ld.bytes_written)){
/* Capture size limit reached, do we have another file? */
if (capture_opts->multi_files_on) {
- if (cnd_autostop_files != NULL && cnd_eval(cnd_autostop_files, ++autostop_files)) {
- /* no files left: stop here */
+ if (cnd_autostop_files != NULL &&
+ cnd_eval(cnd_autostop_files, ++autostop_files)) {
+ /* no files left: stop here */
ld.go = FALSE;
continue;
}
/* Switch to the next ringbuffer file */
- if (ringbuf_switch_file(&ld.wtap_pdh, &capture_opts->save_file, &save_file_fd, &ld.err)) {
+ if (ringbuf_switch_file(&ld.pdh, &capture_opts->save_file,
+ &save_file_fd, &ld.bytes_written, &ld.err)) {
/* File switch succeeded: reset the conditions */
cnd_reset(cnd_autostop_size);
if (cnd_file_duration) {
cnd_reset(cnd_file_duration);
}
- wtap_dump_flush(ld.wtap_pdh);
- sync_pipe_filename_to_parent(capture_opts->save_file);
- ld.packets_sync_pipe = 0;
+ libpcap_dump_flush(ld.pdh, NULL);
+ report_packet_count(inpkts_to_sync_pipe);
+ inpkts_to_sync_pipe = 0;
+ report_new_capture_file(capture_opts->save_file);
} else {
/* File switch failed: stop here */
ld.go = FALSE;
continue;
}
} /* cnd_autostop_size */
+ if (capture_opts->output_to_pipe) {
+ libpcap_dump_flush(ld.pdh, NULL);
+ }
} /* inpkts */
/* Only update once a second (Win32: 500ms) so as not to overload slow displays */
}*/
/* Let the parent process know. */
- if (ld.packets_sync_pipe) {
+ if (inpkts_to_sync_pipe) {
/* do sync here */
- wtap_dump_flush(ld.wtap_pdh);
+ libpcap_dump_flush(ld.pdh, NULL);
- /* Send our parent a message saying we've written out "ld.sync_packets"
- packets to the capture file. */
- sync_pipe_packet_count_to_parent(ld.packets_sync_pipe);
+ /* Send our parent a message saying we've written out "inpkts_to_sync_pipe"
+ packets to the capture file. */
+ report_packet_count(inpkts_to_sync_pipe);
- ld.packets_sync_pipe = 0;
+ inpkts_to_sync_pipe = 0;
}
/* check capture duration condition */
if (cnd_file_duration != NULL && cnd_eval(cnd_file_duration)) {
/* duration limit reached, do we have another file? */
if (capture_opts->multi_files_on) {
- if (cnd_autostop_files != NULL && cnd_eval(cnd_autostop_files, ++autostop_files)) {
+ if (cnd_autostop_files != NULL &&
+ cnd_eval(cnd_autostop_files, ++autostop_files)) {
/* no files left: stop here */
ld.go = FALSE;
continue;
}
/* Switch to the next ringbuffer file */
- if (ringbuf_switch_file(&ld.wtap_pdh, &capture_opts->save_file, &save_file_fd, &ld.err)) {
+ if (ringbuf_switch_file(&ld.pdh, &capture_opts->save_file,
+ &save_file_fd, &ld.bytes_written, &ld.err)) {
/* file switch succeeded: reset the conditions */
cnd_reset(cnd_file_duration);
if(cnd_autostop_size)
cnd_reset(cnd_autostop_size);
- wtap_dump_flush(ld.wtap_pdh);
- sync_pipe_filename_to_parent(capture_opts->save_file);
- ld.packets_sync_pipe = 0;
+ libpcap_dump_flush(ld.pdh, NULL);
+ report_packet_count(inpkts_to_sync_pipe);
+ inpkts_to_sync_pipe = 0;
+ report_new_capture_file(capture_opts->save_file);
} else {
/* File switch failed: stop here */
- ld.go = FALSE;
+ ld.go = FALSE;
continue;
}
} else {
} /* while (ld.go) */
- g_log(LOG_DOMAIN_CAPTURE_CHILD, G_LOG_LEVEL_INFO, "Capture child stopping ...");
+ g_log(LOG_DOMAIN_CAPTURE_CHILD, G_LOG_LEVEL_INFO, "Capture loop stopping ...");
/* delete stop conditions */
if (cnd_file_duration != NULL)
if (ld.pcap_err) {
g_snprintf(errmsg, sizeof(errmsg), "Error while capturing packets: %s",
pcap_geterr(ld.pcap_h));
- sync_pipe_errmsg_to_parent(errmsg);
+ report_capture_error(errmsg, please_report);
}
#ifndef _WIN32
else if (ld.from_cap_pipe && ld.cap_pipe_err == PIPERR)
- sync_pipe_errmsg_to_parent(errmsg);
+ report_capture_error(errmsg, "");
#endif
/* did we had an error while capturing? */
} else {
capture_loop_get_errmsg(errmsg, sizeof(errmsg), capture_opts->save_file, ld.err,
FALSE);
- sync_pipe_errmsg_to_parent(errmsg);
+ report_capture_error(errmsg, please_report);
write_ok = FALSE;
}
- /* close the wiretap (output) file */
- close_ok = capture_loop_close_output(capture_opts, &ld, &err_close);
+ if (capture_opts->saving_to_file) {
+ /* close the wiretap (output) file */
+ close_ok = capture_loop_close_output(capture_opts, &ld, &err_close);
+ } else
+ close_ok = TRUE;
+
+ /* there might be packets not yet notified to the parent */
+ /* (do this after closing the file, so all packets are already flushed) */
+ if(inpkts_to_sync_pipe) {
+ report_packet_count(inpkts_to_sync_pipe);
+ inpkts_to_sync_pipe = 0;
+ }
/* If we've displayed a message about a write error, there's no point
in displaying another message about an error on close. */
if (!close_ok && write_ok) {
capture_loop_get_errmsg(errmsg, sizeof(errmsg), capture_opts->save_file, err_close,
TRUE);
- sync_pipe_errmsg_to_parent(errmsg);
+ report_capture_error(errmsg, "");
}
/*
if (pcap_stats(ld.pcap_h, stats) >= 0) {
*stats_known = TRUE;
/* Let the parent process know. */
- sync_pipe_drops_to_parent(stats->ps_drop);
+ report_packet_drops(stats->ps_drop);
} else {
g_snprintf(errmsg, sizeof(errmsg),
"Can't get packet-drop statistics: %s",
pcap_geterr(ld.pcap_h));
- sync_pipe_errmsg_to_parent(errmsg);
+ report_capture_error(errmsg, please_report);
}
}
/* close the input file (pcap or capture pipe) */
capture_loop_close_input(&ld);
- g_log(LOG_DOMAIN_CAPTURE_CHILD, G_LOG_LEVEL_INFO, "Capture child stopped!");
+ g_log(LOG_DOMAIN_CAPTURE_CHILD, G_LOG_LEVEL_INFO, "Capture loop stopped!");
/* ok, if the write and the close were successful. */
return write_ok && close_ok;
/* cleanup ringbuffer */
ringbuf_error_cleanup();
} else {
- /* We can't use the save file, and we have no wtap_dump stream
+ /* We can't use the save file, and we have no FILE * for the stream
to close in order to close it, so close the FD directly. */
- eth_close(save_file_fd);
+ if(save_file_fd != -1) {
+ eth_close(save_file_fd);
+ }
/* We couldn't even start the capture, so get rid of the capture
file. */
- eth_unlink(capture_opts->save_file); /* silently ignore error */
- g_free(capture_opts->save_file);
+ if(capture_opts->save_file != NULL) {
+ eth_unlink(capture_opts->save_file);
+ g_free(capture_opts->save_file);
+ }
}
capture_opts->save_file = NULL;
- sync_pipe_errmsg_to_parent(errmsg);
+ if (cfilter_error)
+ report_cfilter_error(capture_opts->cfilter, errmsg);
+ else
+ report_capture_error(errmsg, secondary_errmsg);
/* close the input file (pcap or cap_pipe) */
capture_loop_close_input(&ld);
- g_log(LOG_DOMAIN_CAPTURE_CHILD, G_LOG_LEVEL_INFO, "Capture child stopped with error");
+ g_log(LOG_DOMAIN_CAPTURE_CHILD, G_LOG_LEVEL_INFO, "Capture loop stopped with error");
return FALSE;
}
capture_loop_packet_cb(u_char *user, const struct pcap_pkthdr *phdr,
const u_char *pd)
{
- struct wtap_pkthdr whdr;
- union wtap_pseudo_header pseudo_header;
loop_data *ld = (loop_data *) user;
int err;
/* if the user told us to stop after x packets, do we have enough? */
- ld->packets_curr++;
- if ((ld->packets_max > 0) && (ld->packets_curr >= ld->packets_max))
+ ld->packet_count++;
+ if ((ld->packet_max > 0) && (ld->packet_count >= ld->packet_max))
{
ld->go = FALSE;
}
- /* Convert from libpcap to Wiretap format.
- If that fails, set "ld->go" to FALSE, to stop the capture, and set
- "ld->err" to the error. */
- pd = wtap_process_pcap_packet(ld->wtap_linktype, phdr, pd, &pseudo_header,
- &whdr, &err);
- if (pd == NULL) {
- ld->go = FALSE;
- ld->err = err;
- return;
- }
-
- if (ld->wtap_pdh) {
+ if (ld->pdh) {
/* We're supposed to write the packet to a file; do so.
If this fails, set "ld->go" to FALSE, to stop the capture, and set
"ld->err" to the error. */
- if (!wtap_dump(ld->wtap_pdh, &whdr, &pseudo_header, pd, &err)) {
+ if (!libpcap_write_packet(ld->pdh, phdr, pd, &ld->bytes_written, &err)) {
ld->go = FALSE;
ld->err = err;
}
git.samba.org / obnox / wireshark / wip.git / blobdiff