aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--Makefile.common1
-rw-r--r--capture.c1293
-rw-r--r--capture.h26
-rw-r--r--capture_loop.c1355
-rw-r--r--epan/packet.h3
-rw-r--r--gtk/capture_info_dlg.c8
-rw-r--r--gtk/main.c2
7 files changed, 1388 insertions, 1300 deletions
diff --git a/Makefile.common b/Makefile.common
index 09044da7ac..b4a87f6c12 100644
--- a/Makefile.common
+++ b/Makefile.common
@@ -141,6 +141,7 @@ ethereal_SOURCES = \
alert_box.c \
capture.c \
capture_sync.c \
+ capture_loop.c \
capture_combo_utils.c \
color_filters.c \
file.c \
diff --git a/capture.c b/capture.c
index 31c128a034..930b3b398b 100644
--- a/capture.c
+++ b/capture.c
@@ -101,33 +101,6 @@
#include <signal.h>
#include <errno.h>
-#ifdef NEED_SNPRINTF_H
-# include "snprintf.h"
-#endif
-
-/*
- * 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.
- */
-#if !defined(__FreeBSD__) && !defined(__NetBSD__) && !defined(__OpenBSD__) && \
- !defined(__bsdi__) && !defined(__APPLE__) && !defined(_WIN32) && \
- !defined(__CYGWIN__)
-# define MUST_DO_SELECT
-#endif
-
#include <epan/packet.h>
#include <epan/dfilter/dfilter.h>
#include "file.h"
@@ -140,30 +113,8 @@
#include <epan/prefs.h>
#include "globals.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 <epan/dissectors/packet-ap1394.h>
-#include <epan/dissectors/packet-atalk.h>
-#include <epan/dissectors/packet-atm.h>
-#include <epan/dissectors/packet-clip.h>
-#include <epan/dissectors/packet-eth.h>
-#include <epan/dissectors/packet-fddi.h>
-#include <epan/dissectors/packet-null.h>
-#include <epan/dissectors/packet-ppp.h>
-#include <epan/dissectors/packet-raw.h>
-#include <epan/dissectors/packet-sll.h>
-#include <epan/dissectors/packet-tr.h>
-#include <epan/dissectors/packet-ieee80211.h>
-#include <epan/dissectors/packet-chdlc.h>
-#include <epan/dissectors/packet-prism.h>
-#include <epan/dissectors/packet-ipfc.h>
-#include <epan/dissectors/packet-arcnet.h>
-
#ifdef _WIN32
#include "capture-wpcap.h"
#endif
@@ -176,39 +127,12 @@ capture_options capture_opts;
gboolean capture_child; /* if this is the child for "-S" */
-typedef struct _loop_data {
- gboolean go; /* TRUE as long as we're supposed to keep capturing */
- gint max; /* Number of packets we're supposed to capture - 0 means infinite */
- int err; /* if non-zero, error seen while capturing */
- gint linktype;
- gint sync_packets;
- gboolean pcap_err; /* TRUE if error from pcap */
- gboolean from_cap_pipe;/* TRUE if we are capturing data from a pipe */
- packet_counts counts;
- wtap_dumper *pdh;
-#ifndef _WIN32
- gboolean modified; /* TRUE if data in the pipe uses modified pcap headers */
- gboolean byte_swapped; /* TRUE if data in the pipe is byte swapped */
- unsigned int bytes_to_read, 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
-} loop_data;
-
/* Win32 needs the O_BINARY flag for open() */
#ifndef O_BINARY
#define O_BINARY 0
#endif
static gboolean normal_do_capture(gboolean is_tempfile);
-static void capture_pcap_cb(guchar *, const struct pcap_pkthdr *,
- const guchar *);
-static void get_capture_file_io_error(char *, int, const char *, int, gboolean);
-static void popup_errmsg(const char *);
static void stop_capture_signal_handler(int signo);
#ifndef _WIN32
@@ -292,9 +216,6 @@ do_capture(const char *save_file)
}
-
-
-
/* start a normal capture session */
static gboolean
normal_do_capture(gboolean is_tempfile)
@@ -305,7 +226,7 @@ normal_do_capture(gboolean is_tempfile)
int err;
/* Not sync mode. */
- capture_succeeded = capture(&stats_known, &stats);
+ capture_succeeded = capture_start(&stats_known, &stats);
if (capture_opts.quit_after_cap) {
/* DON'T unlink the save file. Presumably someone wants it. */
main_window_exit();
@@ -405,706 +326,17 @@ normal_do_capture(gboolean is_tempfile)
return TRUE;
}
-/*
- * Timeout, in milliseconds, for reads from the stream of captured packets.
- */
-#define CAP_READ_TIMEOUT 250
-#ifndef _WIN32
-/* 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)
-{
- if (ld->byte_swapped) {
- /* Byte-swap the record header fields. */
- rechdr->ts_sec = BSWAP32(rechdr->ts_sec);
- rechdr->ts_usec = BSWAP32(rechdr->ts_usec);
- rechdr->incl_len = BSWAP32(rechdr->incl_len);
- rechdr->orig_len = BSWAP32(rechdr->orig_len);
- }
-
- /* In file format version 2.3, the "incl_len" and "orig_len" fields were
- swapped, in order to match the BPF header layout.
-
- Unfortunately, some files were, according to a comment in the "libpcap"
- source, written with version 2.3 in their headers but without the
- interchanged fields, so if "incl_len" is greater than "orig_len" - which
- would make no sense - we assume that we need to swap them. */
- if (hdr->version_major == 2 &&
- (hdr->version_minor < 3 ||
- (hdr->version_minor == 3 && rechdr->incl_len > rechdr->orig_len))) {
- guint32 temp;
-
- temp = rechdr->orig_len;
- rechdr->orig_len = rechdr->incl_len;
- rechdr->incl_len = temp;
- }
-}
-
-/* Mimic pcap_open_live() for pipe captures
- * We check if "pipename" is "-" (stdin) or a FIFO, open it, and read the
- * header.
- * N.B. : we can't read the libpcap formats used in RedHat 6.1 or SuSE 6.3
- * because we can't seek on pipes (see wiretap/libpcap.c for details) */
-static int
-cap_pipe_open_live(char *pipename, struct pcap_hdr *hdr, loop_data *ld,
- char *errmsg, int errmsgl)
-{
- struct stat pipe_stat;
- int fd;
- guint32 magic;
- int b, sel_ret;
- unsigned int bytes_read;
- fd_set rfds;
- struct timeval timeout;
-
- /*
- * XXX Ethereal blocks until we return
- */
- if (strcmp(pipename, "-") == 0)
- fd = 0; /* read from stdin */
- else {
- if (stat(pipename, &pipe_stat) < 0) {
- if (errno == ENOENT || errno == ENOTDIR)
- ld->cap_pipe_err = PIPNEXIST;
- else {
- snprintf(errmsg, errmsgl,
- "The capture session could not be initiated "
- "due to error on pipe: %s", strerror(errno));
- ld->cap_pipe_err = PIPERR;
- }
- return -1;
- }
- if (! S_ISFIFO(pipe_stat.st_mode)) {
- if (S_ISCHR(pipe_stat.st_mode)) {
- /*
- * Assume the user specified an interface on a system where
- * interfaces are in /dev. Pretend we haven't seen it.
- */
- ld->cap_pipe_err = PIPNEXIST;
- } else {
- snprintf(errmsg, errmsgl,
- "The capture session could not be initiated because\n"
- "\"%s\" is neither an interface nor a pipe", pipename);
- ld->cap_pipe_err = PIPERR;
- }
- return -1;
- }
- fd = open(pipename, O_RDONLY | O_NONBLOCK);
- if (fd == -1) {
- snprintf(errmsg, errmsgl,
- "The capture session could not be initiated "
- "due to error on pipe open: %s", strerror(errno));
- ld->cap_pipe_err = PIPERR;
- return -1;
- }
- }
-
- ld->from_cap_pipe = TRUE;
-
- /* read the pcap header */
- FD_ZERO(&rfds);
- bytes_read = 0;
- while (bytes_read < sizeof magic) {
- FD_SET(fd, &rfds);
- timeout.tv_sec = 0;
- timeout.tv_usec = CAP_READ_TIMEOUT*1000;
- sel_ret = select(fd+1, &rfds, NULL, NULL, &timeout);
- if (sel_ret < 0) {
- snprintf(errmsg, errmsgl,
- "Unexpected error from select: %s", strerror(errno));
- goto error;
- } else if (sel_ret > 0) {
- b = read(fd, ((char *)&magic)+bytes_read, sizeof magic-bytes_read);
- if (b <= 0) {
- if (b == 0)
- snprintf(errmsg, errmsgl, "End of file on pipe during open");
- else
- snprintf(errmsg, errmsgl, "Error on pipe during open: %s",
- strerror(errno));
- goto error;
- }
- bytes_read += b;
- }
- }
-
- switch (magic) {
- case PCAP_MAGIC:
- /* Host that wrote it has our byte order, and was running
- a program using either standard or ss990417 libpcap. */
- ld->byte_swapped = FALSE;
- ld->modified = FALSE;
- break;
- case PCAP_MODIFIED_MAGIC:
- /* Host that wrote it has our byte order, but was running
- a program using either ss990915 or ss991029 libpcap. */
- ld->byte_swapped = FALSE;
- ld->modified = TRUE;
- break;
- case PCAP_SWAPPED_MAGIC:
- /* Host that wrote it has a byte order opposite to ours,
- and was running a program using either standard or
- ss990417 libpcap. */
- ld->byte_swapped = TRUE;
- ld->modified = FALSE;
- break;
- case PCAP_SWAPPED_MODIFIED_MAGIC:
- /* Host that wrote it out has a byte order opposite to
- ours, and was running a program using either ss990915
- or ss991029 libpcap. */
- ld->byte_swapped = TRUE;
- ld->modified = TRUE;
- break;
- default:
- /* Not a "libpcap" type we know about. */
- snprintf(errmsg, errmsgl, "Unrecognized libpcap format");
- goto error;
- }
-
- /* Read the rest of the header */
- bytes_read = 0;
- while (bytes_read < sizeof(struct pcap_hdr)) {
- FD_SET(fd, &rfds);
- timeout.tv_sec = 0;
- timeout.tv_usec = CAP_READ_TIMEOUT*1000;
- sel_ret = select(fd+1, &rfds, NULL, NULL, &timeout);
- if (sel_ret < 0) {
- snprintf(errmsg, errmsgl,
- "Unexpected error from select: %s", strerror(errno));
- goto error;
- } else if (sel_ret > 0) {
- b = read(fd, ((char *)hdr)+bytes_read,
- sizeof(struct pcap_hdr) - bytes_read);
- if (b <= 0) {
- if (b == 0)
- snprintf(errmsg, errmsgl, "End of file on pipe during open");
- else
- snprintf(errmsg, errmsgl, "Error on pipe during open: %s",
- strerror(errno));
- goto error;
- }
- bytes_read += b;
- }
- }
-
- if (ld->byte_swapped) {
- /* Byte-swap the header fields about which we care. */
- hdr->version_major = BSWAP16(hdr->version_major);
- hdr->version_minor = BSWAP16(hdr->version_minor);
- hdr->snaplen = BSWAP32(hdr->snaplen);
- hdr->network = BSWAP32(hdr->network);
- }
-
- if (hdr->version_major < 2) {
- snprintf(errmsg, errmsgl, "Unable to read old libpcap format");
- goto error;
- }
-
- ld->cap_pipe_state = STATE_EXPECT_REC_HDR;
- ld->cap_pipe_err = PIPOK;
- return fd;
-
-error:
- ld->cap_pipe_err = PIPERR;
- close(fd);
- return -1;
-
-}
-
-/* We read one record from the pipe, take care of byte order in the record
- * header, write the record in 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)
+stop_capture_signal_handler(int signo _U_)
{
- struct pcap_pkthdr phdr;
- int b;
- enum { PD_REC_HDR_READ, PD_DATA_READ, PD_PIPE_EOF, PD_PIPE_ERR,
- PD_ERR } result;
-
- switch (ld->cap_pipe_state) {
-
- case STATE_EXPECT_REC_HDR:
- ld->bytes_to_read = ld->modified ?
- sizeof(struct pcaprec_modified_hdr) : sizeof(struct pcaprec_hdr);
- ld->bytes_read = 0;
- ld->cap_pipe_state = STATE_READ_REC_HDR;
- /* Fall through */
-
- case STATE_READ_REC_HDR:
- b = read(fd, ((char *)rechdr)+ld->bytes_read,
- ld->bytes_to_read - ld->bytes_read);
- if (b <= 0) {
- if (b == 0)
- result = PD_PIPE_EOF;
- else
- result = PD_PIPE_ERR;
- break;
- }
- if ((ld->bytes_read += b) < ld->bytes_to_read)
- return 0;
- result = PD_REC_HDR_READ;
- break;
-
- case STATE_EXPECT_DATA:
- ld->bytes_read = 0;
- ld->cap_pipe_state = STATE_READ_DATA;
- /* Fall through */
-
- case STATE_READ_DATA:
- b = read(fd, data+ld->bytes_read, rechdr->hdr.incl_len - ld->bytes_read);
- if (b <= 0) {
- if (b == 0)
- result = PD_PIPE_EOF;
- else
- result = PD_PIPE_ERR;
- break;
- }
- if ((ld->bytes_read += b) < rechdr->hdr.incl_len)
- return 0;
- result = PD_DATA_READ;
- break;
-
- default:
- snprintf(errmsg, errmsgl, "cap_pipe_dispatch: invalid state");
- result = PD_ERR;
-
- } /* switch (ld->cap_pipe_state) */
-
- /*
- * We've now read as much data as we were expecting, so process it.
- */
- switch (result) {
-
- 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) {
- snprintf(errmsg, errmsgl, "Frame %u too long (%d bytes)",
- ld->counts.total+1, rechdr->hdr.incl_len);
- break;
- }
- ld->cap_pipe_state = STATE_EXPECT_DATA;
- return 0;
-
- 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;
-
- capture_pcap_cb((guchar *)ld, &phdr, data);
-
- ld->cap_pipe_state = STATE_EXPECT_REC_HDR;
- return 1;
-
- case PD_PIPE_EOF:
- ld->cap_pipe_err = PIPEOF;
- return -1;
-
- case PD_PIPE_ERR:
- snprintf(errmsg, errmsgl, "Error reading from pipe: %s",
- strerror(errno));
- /* Fall through */
- case PD_ERR:
- break;
- }
-
- ld->cap_pipe_err = PIPERR;
- /* Return here rather than inside the switch to prevent GCC warning */
- return -1;
+ capture_loop_stop();
}
-#endif /* not _WIN32 */
-/*
- * 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
-capture(gboolean *stats_known, struct pcap_stat *stats)
+int
+capture_start(gboolean *stats_known, struct pcap_stat *stats)
{
- pcap_t *pch;
- int pcap_encap;
- int file_snaplen;
- gchar open_err_str[PCAP_ERRBUF_SIZE];
- gchar lookup_net_err_str[PCAP_ERRBUF_SIZE];
- bpf_u_int32 netnum, netmask;
- struct bpf_program fcode;
- const char *set_linktype_err_str;
- time_t upd_time, cur_time;
- time_t start_time;
- int err, inpkts;
- condition *cnd_file_duration = NULL;
- condition *cnd_autostop_files = NULL;
- condition *cnd_autostop_size = NULL;
- condition *cnd_autostop_duration = NULL;
- guint32 autostop_files = 0;
- char errmsg[4096+1];
- gboolean write_ok;
- gboolean close_ok;
- capture_info capture_ui;
-
-#ifdef _WIN32
- WORD wVersionRequested;
- WSADATA wsaData;
-#else
- fd_set set1;
- struct timeval timeout;
- static const char ppamsg[] = "can't find PPA for ";
- char *libpcap_warn;
- int sel_ret;
- int pipe_fd = -1;
- struct pcap_hdr hdr;
- struct pcaprec_modified_hdr rechdr;
- guchar pcap_data[WTAP_MAX_PACKET_SIZE];
-#endif
-#ifdef MUST_DO_SELECT
- int pcap_fd = 0;
-#endif
- gboolean show_info = capture_opts.show_info || !capture_opts.sync_mode;
-
- /* Initialize Windows Socket if we are in a WIN32 OS
- This needs to be done before querying the interface for network/netmask */
-#ifdef _WIN32
- /* XXX - do we really require 1.1 or earlier?
- Are there any versions that support only 2.0 or higher? */
- wVersionRequested = MAKEWORD(1, 1);
- err = WSAStartup(wVersionRequested, &wsaData);
- if (err != 0) {
- switch (err) {
-
- case WSASYSNOTREADY:
- snprintf(errmsg, sizeof errmsg,
- "Couldn't initialize Windows Sockets: Network system not ready for network communication");
- break;
-
- case WSAVERNOTSUPPORTED:
- snprintf(errmsg, sizeof errmsg,
- "Couldn't initialize Windows Sockets: Windows Sockets version %u.%u not supported",
- LOBYTE(wVersionRequested), HIBYTE(wVersionRequested));
- break;
-
- case WSAEINPROGRESS:
- snprintf(errmsg, sizeof errmsg,
- "Couldn't initialize Windows Sockets: Blocking operation is in progress");
- break;
-
- case WSAEPROCLIM:
- snprintf(errmsg, sizeof errmsg,
- "Couldn't initialize Windows Sockets: Limit on the number of tasks supported by this WinSock implementation has been reached");
- break;
-
- case WSAEFAULT:
- snprintf(errmsg, sizeof errmsg,
- "Couldn't initialize Windows Sockets: Bad pointer passed to WSAStartup");
- break;
-
- default:
- snprintf(errmsg, sizeof errmsg,
- "Couldn't initialize Windows Sockets: error %d", err);
- break;
- }
- pch = NULL;
- goto error;
- }
-#endif
-
- ld.go = TRUE;
- ld.counts.total = 0;
- if (capture_opts.has_autostop_packets)
- ld.max = capture_opts.autostop_packets;
- else
- ld.max = 0; /* no limit */
- ld.err = 0; /* no error seen yet */
- ld.linktype = WTAP_ENCAP_UNKNOWN;
- ld.pcap_err = FALSE;
- ld.from_cap_pipe = FALSE;
- ld.sync_packets = 0;
- ld.counts.sctp = 0;
- ld.counts.tcp = 0;
- ld.counts.udp = 0;
- ld.counts.icmp = 0;
- ld.counts.ospf = 0;
- ld.counts.gre = 0;
- ld.counts.ipx = 0;
- ld.counts.netbios = 0;
- ld.counts.vines = 0;
- ld.counts.other = 0;
- ld.counts.arp = 0;
- ld.pdh = NULL;
-
- /* We haven't yet gotten the capture statistics. */
- *stats_known = FALSE;
-
- /* Open the network interface to capture from it.
- Some versions of libpcap may put warnings into the error buffer
- if they succeed; to tell if that's happened, we have to clear
- the error buffer, and check if it's still a null string. */
- open_err_str[0] = '\0';
- pch = pcap_open_live(cfile.iface,
- capture_opts.has_snaplen ? capture_opts.snaplen :
- WTAP_MAX_PACKET_SIZE,
- capture_opts.promisc_mode, CAP_READ_TIMEOUT,
- open_err_str);
-
- if (pch != NULL) {
-#ifdef _WIN32
- /* try to set the capture buffer size */
- if (pcap_setbuff(pch, 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"
- "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);
- }
-#endif
-
- /* setting the data link type only works on real interfaces */
- if (capture_opts.linktype != -1) {
- set_linktype_err_str = set_pcap_linktype(pch, cfile.iface,
- capture_opts.linktype);
- if (set_linktype_err_str != NULL) {
- snprintf(errmsg, sizeof errmsg, "Unable to set data link type (%s).",
- set_linktype_err_str);
- goto error;
- }
- }
- } else {
- /* We couldn't open "cfile.iface" as a network device. */
-#ifdef _WIN32
- /* On Windows, we don't support capturing on pipes, so we give up.
- If this is a child process that does the capturing in sync
- mode or fork mode, it shouldn't do any UI stuff until we pop up the
- capture-progress window, and, since we couldn't start the
- capture, we haven't popped it up. */
- if (!capture_child) {
- main_window_update();
- }
-
- /* 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. */
- snprintf(errmsg, sizeof errmsg,
- "The capture session could not be initiated (%s).\n"
- "Please check that you have the proper interface specified.\n"
- "\n"
- "Note that the WinPcap 2.x version of the driver Ethereal uses for packet\n"
- "capture on Windows doesn't support capturing on PPP/WAN interfaces in\n"
- "Windows NT/2000/XP/2003 Server, and that the WinPcap 3.0 and later versions\n"
- "don't support capturing on PPP/WAN interfaces at all.",
- open_err_str);
- goto error;
-#else
- /* try to open cfile.iface as a pipe */
- pipe_fd = cap_pipe_open_live(cfile.iface, &hdr, &ld, errmsg, sizeof errmsg);
-
- if (pipe_fd == -1) {
-
- /* If this is a child process that does the capturing in sync
- * mode or fork mode, it shouldn't do any UI stuff until we pop up the
- * capture-progress window, and, since we couldn't start the
- * capture, we haven't popped it up.
- */
- if (!capture_child) {
- main_window_update();
- }
-
- 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
- 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"). */
- 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"
- "that doesn't handle HP-UX network devices well; this means that\n"
- "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"
- "packaged binary form from the Software Porting And Archive Centre\n"
- "for HP-UX; the Centre is at http://hpux.connect.org.uk/ - the page\n"
- "at the URL lists a number of mirror sites.";
- else
- libpcap_warn = "";
- snprintf(errmsg, sizeof errmsg,
- "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);
- }
- /*
- * Else pipe (or file) does exist and cap_pipe_open_live() has
- * filled in errmsg
- */
- goto error;
- } else
- /* cap_pipe_open_live() succeeded; don't want
- error message from pcap_open_live() */
- open_err_str[0] = '\0';
-#endif
- }
-
- /* capture filters only work on real interfaces */
- if (cfile.cfilter && !ld.from_cap_pipe) {
- /* A capture filter was specified; set it up. */
- if (pcap_lookupnet(cfile.iface, &netnum, &netmask, lookup_net_err_str) < 0) {
- /*
- * Well, we can't get the netmask for this interface; it's used
- * only for filters that check for broadcast IP addresses, so
- * we just punt and use 0. It might be nice to warn the user,
- * but that's a pain in a GUI application, as it'd involve popping
- * up a message box, and it's not clear how often this would make
- * a difference (only filters that check for IP broadcast addresses
- * use the netmask).
- */
- netmask = 0;
- }
- if (pcap_compile(pch, &fcode, cfile.cfilter, 1, netmask) < 0) {
- dfilter_t *rfcode = NULL;
- /* filter string invalid, did the user tried a display filter? */
- if (dfilter_compile(cfile.cfilter, &rfcode) && rfcode != NULL) {
- snprintf(errmsg, sizeof errmsg,
- "%sInvalid capture filter: \"%s\"!%s\n"
- "\n"
- "That string looks like a valid display filter; however, it is not 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(), cfile.cfilter, simple_dialog_primary_end(),
- pcap_geterr(pch));
- dfilter_free(rfcode);
- } else {
- snprintf(errmsg, sizeof errmsg,
- "%sInvalid capture filter: \"%s\"!%s\n"
- "\n"
- "That string is not a valid capture filter (%s).\n"
- "See the help for a description of the capture filter syntax.",
- simple_dialog_primary_start(), cfile.cfilter, simple_dialog_primary_end(),
- pcap_geterr(pch));
- }
- goto error;
- }
- if (pcap_setfilter(pch, &fcode) < 0) {
- snprintf(errmsg, sizeof errmsg, "Can't install filter (%s).",
- pcap_geterr(pch));
- goto error;
- }
- }
-
- /* Set up to write to the capture file. */
-#ifndef _WIN32
- if (ld.from_cap_pipe) {
- pcap_encap = hdr.network;
- file_snaplen = hdr.snaplen;
- } else
-#endif
- {
- pcap_encap = get_pcap_linktype(pch, cfile.iface);
- file_snaplen = pcap_snapshot(pch);
- }
- ld.linktype = wtap_pcap_encap_to_wtap_encap(pcap_encap);
- if (ld.linktype == WTAP_ENCAP_UNKNOWN) {
- snprintf(errmsg, sizeof errmsg,
- "The network you're capturing from is of a type"
- " that Ethereal doesn't support (data link type %d).", pcap_encap);
- goto error;
- }
- if (capture_opts.multi_files_on) {
- ld.pdh = ringbuf_init_wtap_dump_fdopen(WTAP_FILE_PCAP, ld.linktype,
- file_snaplen, &err);
- } else {
- ld.pdh = wtap_dump_fdopen(cfile.save_file_fd, WTAP_FILE_PCAP,
- ld.linktype, file_snaplen, &err);
- }
-
- if (ld.pdh == NULL) {
- /* We couldn't set up to write to the capture file. */
- switch (err) {
-
- case WTAP_ERR_CANT_OPEN:
- strcpy(errmsg, "The file to which the capture would be saved"
- " couldn't be created for some unknown reason.");
- break;
-
- case WTAP_ERR_SHORT_WRITE:
- strcpy(errmsg, "A full header couldn't be written to the file"
- " to which the capture would be saved.");
- break;
-
- default:
- if (err < 0) {
- snprintf(errmsg, sizeof(errmsg),
- "The file to which the capture would be"
- " saved (\"%s\") could not be opened: Error %d.",
- cfile.save_file, err);
- } else {
- snprintf(errmsg, sizeof(errmsg),
- "The file to which the capture would be"
- " saved (\"%s\") could not be opened: %s.",
- cfile.save_file, strerror(err));
- }
- break;
- }
- goto error;
- }
-
- /* 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);
-
- /* 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. */
-
- if (capture_child) {
- /* Well, we should be able to start capturing.
-
- This is the child process for a sync mode capture, so 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. */
- fflush(wtap_dump_file(ld.pdh));
- sync_pipe_capstart_to_parent();
- }
-
- /* start capture info dialog */
- if(show_info) {
- capture_ui.callback_data = &ld;
- capture_ui.counts = &ld.counts;
- capture_info_create(&capture_ui, cfile.iface);
- }
-
- start_time = time(NULL);
- upd_time = time(NULL);
-#ifdef MUST_DO_SELECT
- if (!ld.from_cap_pipe) pcap_fd = pcap_fileno(pch);
-#endif
-
#ifndef _WIN32
/*
* Catch SIGUSR1, so that we exit cleanly if the parent process
@@ -1114,430 +346,17 @@ capture(gboolean *stats_known, struct pcap_stat *stats)
signal(SIGUSR1, stop_capture_signal_handler);
#endif
- /* initialize capture stop conditions */
- init_capture_stop_conditions();
- /* create stop conditions */
- if (capture_opts.has_autostop_filesize)
- cnd_autostop_size =
- cnd_new(CND_CLASS_CAPTURESIZE,(long)capture_opts.autostop_filesize);
- if (capture_opts.has_autostop_duration)
- cnd_autostop_duration =
- cnd_new(CND_CLASS_TIMEOUT,(gint32)capture_opts.autostop_duration);
-
- if (capture_opts.multi_files_on) {
- if (capture_opts.has_file_duration)
- cnd_file_duration =
- cnd_new(CND_CLASS_TIMEOUT, capture_opts.file_duration);
-
- if (capture_opts.has_autostop_files)
- cnd_autostop_files =
- cnd_new(CND_CLASS_CAPTURESIZE, capture_opts.autostop_files);
- }
-
- /* WOW, everything is prepared! */
- /* please fasten your seat belts, we will enter now the actual capture loop */
- while (ld.go) {
- main_window_update();
-
-#ifndef _WIN32
- if (ld.from_cap_pipe) {
- FD_ZERO(&set1);
- FD_SET(pipe_fd, &set1);
- timeout.tv_sec = 0;
- timeout.tv_usec = CAP_READ_TIMEOUT*1000;
- sel_ret = select(pipe_fd+1, &set1, NULL, NULL, &timeout);
- if (sel_ret <= 0) {
- inpkts = 0;
- if (sel_ret < 0 && errno != EINTR) {
- snprintf(errmsg, sizeof(errmsg),
- "Unexpected error from select: %s", strerror(errno));
- popup_errmsg(errmsg);
- ld.go = FALSE;
- }
- } else {
- /*
- * "select()" says we can read from the pipe without blocking
- */
- inpkts = cap_pipe_dispatch(pipe_fd, &ld, &hdr, &rechdr, pcap_data,
- errmsg, sizeof errmsg);
- if (inpkts < 0) {
- ld.go = FALSE;
- }
- }
- }
- else
-#endif /* _WIN32 */
- {
-#ifdef MUST_DO_SELECT
- /*
- * Sigh. The semantics of the read timeout argument to
- * "pcap_open_live()" aren't particularly well specified by
- * the "pcap" man page - at least with the BSD BPF code, the
- * intent appears to be, at least in part, a way of cutting
- * down the number of reads done on a capture, by blocking
- * until the buffer fills or a timer expires - and the Linux
- * libpcap doesn't actually support it, so we can't use it
- * to break out of the "pcap_dispatch()" every 1/4 of a second
- * or so. Linux's libpcap is not the only libpcap that doesn't
- * support the read timeout.
- *
- * Furthermore, at least on Solaris, the bufmod STREAMS module's
- * read timeout won't go off if no data has arrived, i.e. it cannot
- * be used to guarantee that a read from a DLPI stream will return
- * within a specified amount of time regardless of whether any
- * data arrives or not.
- *
- * Thus, on all platforms other than BSD, we do a "select()" on the
- * file descriptor for the capture, with a timeout of CAP_READ_TIMEOUT
- * milliseconds, or CAP_READ_TIMEOUT*1000 microseconds.
- *
- * "select()", on BPF devices, doesn't work as you might expect;
- * at least on some versions of some flavors of BSD, the timer
- * doesn't start until a read is done, so it won't expire if
- * only a "select()" or "poll()" is posted.
- */
- FD_ZERO(&set1);
- FD_SET(pcap_fd, &set1);
- timeout.tv_sec = 0;
- timeout.tv_usec = CAP_READ_TIMEOUT*1000;
- sel_ret = select(pcap_fd+1, &set1, NULL, NULL, &timeout);
- if (sel_ret > 0) {
- /*
- * "select()" says we can read from it without blocking; go for
- * it.
- */
- inpkts = pcap_dispatch(pch, 1, capture_pcap_cb, (guchar *) &ld);
- if (inpkts < 0) {
- ld.pcap_err = TRUE;
- ld.go = FALSE;
- }
- } else {
- inpkts = 0;
- if (sel_ret < 0 && errno != EINTR) {
- snprintf(errmsg, sizeof(errmsg),
- "Unexpected error from select: %s", strerror(errno));
- popup_errmsg(errmsg);
- ld.go = FALSE;
- }
- }
-#else
- inpkts = pcap_dispatch(pch, 1, capture_pcap_cb, (guchar *) &ld);
- if (inpkts < 0) {
- ld.pcap_err = TRUE;
- ld.go = FALSE;
- }
-#endif /* MUST_DO_SELECT */
- }
-
- if (inpkts > 0) {
- ld.sync_packets += inpkts;
-
- /* check capture size condition */
- if (cnd_autostop_size != NULL && cnd_eval(cnd_autostop_size,
- (guint32)wtap_get_bytes_dumped(ld.pdh))){
- /* 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 */
- ld.go = FALSE;
- continue;
- }
-
- /* Switch to the next ringbuffer file */
- if (ringbuf_switch_file(&cfile, &ld.pdh, &ld.err)) {
- /* File switch succeeded: reset the conditions */
- cnd_reset(cnd_autostop_size);
- if (cnd_file_duration) {
- cnd_reset(cnd_file_duration);
- }
- } else {
- /* File switch failed: stop here */
- ld.go = FALSE;
- continue;
- }
- } else {
- /* single file, stop now */
- ld.go = FALSE;
- continue;
- }
- } /* cnd_autostop_size */
- }
-
- /* Only update once a second so as not to overload slow displays */
- cur_time = time(NULL);
- if (cur_time > upd_time) {
- upd_time = cur_time;
-
- /*if (pcap_stats(pch, stats) >= 0) {
- *stats_known = TRUE;
- }*/
-
- /* Let the parent process know. */
- /* calculate and display running time */
- if(show_info) {
- cur_time -= start_time;
- capture_ui.running_time = cur_time;
- capture_ui.new_packets = ld.sync_packets;
- capture_info_update(&capture_ui);
- }
-
- if (ld.sync_packets) {
- /* do sync here */
- fflush(wtap_dump_file(ld.pdh));
-
- if (capture_child) {
- /* This is the child process for a sync mode capture, so 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.sync_packets);
- }
-
- ld.sync_packets = 0;
- }
-
- /* check capture duration condition */
- if (cnd_autostop_duration != NULL && cnd_eval(cnd_autostop_duration)) {
- /* The maximum capture time has elapsed; stop the capture. */
- ld.go = FALSE;
- continue;
- }
-
- /* check capture file 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)) {
- /* no files left: stop here */
- ld.go = FALSE;
- continue;
- }
-
- /* Switch to the next ringbuffer file */
- if (ringbuf_switch_file(&cfile, &ld.pdh, &ld.err)) {
- /* file switch succeeded: reset the conditions */
- cnd_reset(cnd_file_duration);
- if(cnd_autostop_size)
- cnd_reset(cnd_autostop_size);
- } else {
- /* File switch failed: stop here */
- ld.go = FALSE;
- continue;
- }
- } else {
- /* single file, stop now */
- ld.go = FALSE;
- continue;
- }
- } /* cnd_file_duration */
- }
-
- } /* while (ld.go) */
-
- /* delete stop conditions */
- if (cnd_file_duration != NULL)
- cnd_delete(cnd_file_duration);
- if (cnd_autostop_files != NULL)
- cnd_delete(cnd_autostop_files);
- if (cnd_autostop_size != NULL)
- cnd_delete(cnd_autostop_size);
- if (cnd_autostop_duration != NULL)
- cnd_delete(cnd_autostop_duration);
-
- if (ld.pcap_err) {
- snprintf(errmsg, sizeof(errmsg), "Error while capturing packets: %s",
- pcap_geterr(pch));
- popup_errmsg(errmsg);
-#ifdef _WIN32
- }
-#else
- } else if (ld.from_cap_pipe && ld.cap_pipe_err == PIPERR)
- popup_errmsg(errmsg);
-#endif
-
- if (ld.err == 0)
- write_ok = TRUE;
- else {
- get_capture_file_io_error(errmsg, sizeof(errmsg), cfile.save_file, ld.err,
- FALSE);
- popup_errmsg(errmsg);
- write_ok = FALSE;
- }
-
- if (capture_opts.multi_files_on) {
- close_ok = ringbuf_wtap_dump_close(&cfile, &err);
- } else {
- close_ok = wtap_dump_close(ld.pdh, &err);
- }
- /* 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) {
- get_capture_file_io_error(errmsg, sizeof(errmsg), cfile.save_file, err,
- TRUE);
- popup_errmsg(errmsg);
- }
- /* Set write_ok to mean the write and the close were successful. */
- write_ok = (write_ok && close_ok);
-
-#ifndef _WIN32
- /*
- * XXX We exhibit different behaviour between normal mode and sync mode
- * when the pipe is stdin and not already at EOF. If we're a child, the
- * parent's stdin isn't closed, so if the user starts another capture,
- * cap_pipe_open_live() will very likely not see the expected magic bytes and
- * will say "Unrecognized libpcap format". On the other hand, in normal
- * mode, cap_pipe_open_live() will say "End of file on pipe during open".
- */
- if (ld.from_cap_pipe && pipe_fd >= 0)
- close(pipe_fd);
- else
-#endif
- {
- /* Get the capture statistics, so we know how many packets were
- dropped. */
- if (pcap_stats(pch, stats) >= 0) {
- *stats_known = TRUE;
- if (capture_child) {
- /* Let the parent process know. */
- sync_pipe_drops_to_parent(stats->ps_drop);
- }
- } else {
- snprintf(errmsg, sizeof(errmsg),
- "Can't get packet-drop statistics: %s",
- pcap_geterr(pch));
- popup_errmsg(errmsg);
- }
- pcap_close(pch);
- }
-
-#ifdef _WIN32
- /* Shut down windows sockets */
- WSACleanup();
-#endif
-
- if(show_info) {
- capture_info_destroy(&capture_ui);
- }
-
- return write_ok;
-
-error:
- if (capture_opts.multi_files_on) {
- /* cleanup ringbuffer */
- ringbuf_error_cleanup();
- } else {
- /* We can't use the save file, and we have no wtap_dump stream
- to close in order to close it, so close the FD directly. */
- close(cfile.save_file_fd);
-
- /* We couldn't even start the capture, so get rid of the capture
- file. */
- unlink(cfile.save_file); /* silently ignore error */
- g_free(cfile.save_file);
- }
- cfile.save_file = NULL;
- popup_errmsg(errmsg);
-
-#ifndef _WIN32
- if (ld.from_cap_pipe) {
- if (pipe_fd >= 0)
- close(pipe_fd);
- } else
-#endif
- {
- if (pch != NULL)
- pcap_close(pch);
- }
-
- return FALSE;
-}
-
-static void
-get_capture_file_io_error(char *errmsg, int errmsglen, const char *fname,
- int err, gboolean is_close)
-{
- switch (err) {
-
- case ENOSPC:
- snprintf(errmsg, errmsglen,
- "Not all the packets could be written to the file"
- " to which the capture was being saved\n"
- "(\"%s\") because there is no space left on the file system\n"
- "on which that file resides.",
- fname);
- break;
-
-#ifdef EDQUOT
- case EDQUOT:
- snprintf(errmsg, errmsglen,
- "Not all the packets could be written to the file"
- " to which the capture was being saved\n"
- "(\"%s\") because you are too close to, or over,"
- " your disk quota\n"
- "on the file system on which that file resides.",
- fname);
- break;
-#endif
-
- case WTAP_ERR_CANT_CLOSE:
- snprintf(errmsg, errmsglen,
- "The file to which the capture was being saved"
- " couldn't be closed for some unknown reason.");
- break;
-
- case WTAP_ERR_SHORT_WRITE:
- snprintf(errmsg, errmsglen,
- "Not all the packets could be written to the file"
- " to which the capture was being saved\n"
- "(\"%s\").",
- fname);
- break;
-
- default:
- if (is_close) {
- snprintf(errmsg, errmsglen,
- "The file to which the capture was being saved\n"
- "(\"%s\") could not be closed: %s.",
- fname, wtap_strerror(err));
- } else {
- snprintf(errmsg, errmsglen,
- "An error occurred while writing to the file"
- " to which the capture was being saved\n"
- "(\"%s\"): %s.",
- fname, wtap_strerror(err));
- }
- break;
- }
-}
-
-static void
-popup_errmsg(const char *errmsg)
-{
- if (capture_child) {
- /* This is the child process for a sync mode capture.
- Send the error message to our parent, so they can display a
- dialog box containing it. */
- sync_pipe_errmsg_to_parent(errmsg);
- } else {
- /* Display the dialog box ourselves; there's no parent. */
- simple_dialog(ESD_TYPE_ERROR, ESD_BTN_OK, "%s", errmsg);
- }
+ return capture_loop_start(stats_known, stats);
}
-static void
-stop_capture_signal_handler(int signo _U_)
-{
- ld.go = FALSE;
-}
-
-
void
capture_stop(void)
{
if (capture_opts.sync_mode) {
- sync_pipe_stop();
+ sync_pipe_stop();
} else {
- ld.go = FALSE;
+ capture_loop_stop();
}
}
@@ -1549,101 +368,5 @@ kill_capture_child(void)
}
}
-/* one packet was captured, process it */
-static void
-capture_pcap_cb(guchar *user, const struct pcap_pkthdr *phdr,
- const guchar *pd)
-{
- struct wtap_pkthdr whdr;
- union wtap_pseudo_header pseudo_header;
- loop_data *ld = (loop_data *) user;
- int err;
-
- /* user told us to stop after x packets, do we have enough? */
- if ((++ld->counts.total >= ld->max) && (ld->max > 0))
- {
- 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->linktype, phdr, pd, &pseudo_header,
- &whdr, &err);
- if (pd == NULL) {
- ld->go = FALSE;
- ld->err = err;
- return;
- }
-
- 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->pdh, &whdr, &pseudo_header, pd, &err)) {
- ld->go = FALSE;
- ld->err = err;
- }
- }
-
- switch (ld->linktype) {
- case WTAP_ENCAP_ETHERNET:
- capture_eth(pd, 0, whdr.caplen, &ld->counts);
- break;
- case WTAP_ENCAP_FDDI:
- case WTAP_ENCAP_FDDI_BITSWAPPED:
- capture_fddi(pd, whdr.caplen, &ld->counts);
- break;
- case WTAP_ENCAP_PRISM_HEADER:
- capture_prism(pd, 0, whdr.caplen, &ld->counts);
- break;
- case WTAP_ENCAP_TOKEN_RING:
- capture_tr(pd, 0, whdr.caplen, &ld->counts);
- break;
- case WTAP_ENCAP_NULL:
- capture_null(pd, whdr.caplen, &ld->counts);
- break;
- case WTAP_ENCAP_PPP:
- capture_ppp_hdlc(pd, 0, whdr.caplen, &ld->counts);
- break;
- case WTAP_ENCAP_RAW_IP:
- capture_raw(pd, whdr.caplen, &ld->counts);
- break;
- case WTAP_ENCAP_SLL:
- capture_sll(pd, whdr.caplen, &ld->counts);
- break;
- case WTAP_ENCAP_LINUX_ATM_CLIP:
- capture_clip(pd, whdr.caplen, &ld->counts);
- break;
- case WTAP_ENCAP_IEEE_802_11:
- case WTAP_ENCAP_IEEE_802_11_WITH_RADIO:
- capture_ieee80211(pd, 0, whdr.caplen, &ld->counts);
- break;
- case WTAP_ENCAP_CHDLC:
- capture_chdlc(pd, 0, whdr.caplen, &ld->counts);
- break;
- case WTAP_ENCAP_LOCALTALK:
- capture_llap(&ld->counts);
- break;
- case WTAP_ENCAP_ATM_PDUS:
- capture_atm(&pseudo_header, pd, whdr.caplen, &ld->counts);
- break;
- case WTAP_ENCAP_IP_OVER_FC:
- capture_ipfc(pd, whdr.caplen, &ld->counts);
- break;
- case WTAP_ENCAP_ARCNET:
- capture_arcnet(pd, whdr.caplen, &ld->counts, FALSE, TRUE);
- break;
- case WTAP_ENCAP_ARCNET_LINUX:
- capture_arcnet(pd, whdr.caplen, &ld->counts, TRUE, FALSE);
- break;
- case WTAP_ENCAP_APPLE_IP_OVER_IEEE1394:
- capture_ap1394(pd, 0, whdr.caplen, &ld->counts);
- break;
- /* XXX - some ATM drivers on FreeBSD might prepend a 4-byte ATM
- pseudo-header to DLT_ATM_RFC1483, with LLC header following;
- we might have to implement that at some point. */
- }
-}
#endif /* HAVE_LIBPCAP */
diff --git a/capture.h b/capture.h
index 1462ad2bf5..d9707a9fd5 100644
--- a/capture.h
+++ b/capture.h
@@ -83,23 +83,29 @@ extern capture_options capture_opts;
/** True if this is the child for "-S" */
extern gboolean capture_child;
+
/** Open a specified file, or create a temporary file, and start a capture
- to the file in question. Returns TRUE if the capture starts
- successfully, FALSE otherwise. */
-gboolean do_capture(const char *save_file);
+ * to the file in question.
+ *
+ * @return TRUE if the capture starts successfully, FALSE otherwise. */
+extern gboolean do_capture(const char *save_file);
-/** Do the low-level work of a capture. */
-int capture(gboolean *stats_known, struct pcap_stat *stats);
+/** Do the low-level work of a capture (start the capture child). */
+extern int capture_start(gboolean *stats_known, struct pcap_stat *stats);
/** Stop a capture from a menu item. */
-void capture_stop(void);
+extern void capture_stop(void);
/** Terminate the capture child cleanly when exiting. */
-void kill_capture_child(void);
+extern void kill_capture_child(void);
+
+/** Do the low-level work of a capture. */
+extern int capture_loop_start(gboolean *stats_known, struct pcap_stat *stats);
+
+/** Stop a low-level capture. */
+extern void capture_loop_stop(void);
+
-/** Number of packet counts.
- * @todo improve this macro (put something like this into epan/packet.h?) */
-#define CAPTURE_PACKET_COUNTS sizeof(packet_counts) / sizeof (gint)
/** Current Capture info. */
typedef struct {
diff --git a/capture_loop.c b/capture_loop.c
new file mode 100644
index 0000000000..b0e6baebfc
--- /dev/null
+++ b/capture_loop.c
@@ -0,0 +1,1355 @@
+/* capture_loop.c
+ * The actual capturing loop, getting packets and storing it
+ *
+ * $Id$
+ *
+ * Ethereal - Network traffic analyzer
+ * By Gerald Combs <gerald@ethereal.com>
+ * Copyright 1998 Gerald Combs
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ */
+
+
+/** @file
+ *
+ * Capture loop (internal interface).
+ *
+ */
+
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
+#ifdef HAVE_LIBPCAP
+
+#include <pcap.h>
+
+#include <glib.h>
+
+#include <signal.h>
+#include <errno.h>
+
+#include <epan/packet.h>
+#include "capture.h"
+#include "capture_sync.h"
+#include "pcap-util.h"
+
+#include "simple_dialog.h"
+#include "globals.h"
+#include "conditions.h"
+#include "capture_stop_conditions.h"
+#include "ringbuffer.h"
+
+#include "wiretap/wtap.h"
+#include "wiretap/wtap-capture.h"
+
+#include <epan/prefs.h>
+/* XXX - try to remove this later */
+#include "ui_util.h"
+/* XXX - try to remove this later */
+
+
+#include <epan/dissectors/packet-ap1394.h>
+#include <epan/dissectors/packet-atalk.h>
+#include <epan/dissectors/packet-atm.h>
+#include <epan/dissectors/packet-clip.h>
+#include <epan/dissectors/packet-eth.h>
+#include <epan/dissectors/packet-fddi.h>
+#include <epan/dissectors/packet-null.h>
+#include <epan/dissectors/packet-ppp.h>
+#include <epan/dissectors/packet-raw.h>
+#include <epan/dissectors/packet-sll.h>
+#include <epan/dissectors/packet-tr.h>
+#include <epan/dissectors/packet-ieee80211.h>
+#include <epan/dissectors/packet-chdlc.h>
+#include <epan/dissectors/packet-prism.h>
+#include <epan/dissectors/packet-ipfc.h>
+#include <epan/dissectors/packet-arcnet.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.
+ */
+#if !defined(__FreeBSD__) && !defined(__NetBSD__) && !defined(__OpenBSD__) && \
+ !defined(__bsdi__) && !defined(__APPLE__) && !defined(_WIN32) && \
+ !defined(__CYGWIN__)
+# define MUST_DO_SELECT
+#endif
+
+
+typedef struct _loop_data {
+ gboolean go; /* TRUE as long as we're supposed to keep capturing */
+ gint max; /* Number of packets we're supposed to capture - 0 means infinite */
+ int err; /* if non-zero, error seen while capturing */
+ gint linktype;
+ gint sync_packets;
+ gboolean pcap_err; /* TRUE if error from pcap */
+ gboolean from_cap_pipe;/* TRUE if we are capturing data from a pipe */
+ packet_counts counts;
+ wtap_dumper *pdh;
+#ifndef _WIN32
+ gboolean modified; /* TRUE if data in the pipe uses modified pcap headers */
+ gboolean byte_swapped; /* TRUE if data in the pipe is byte swapped */
+ unsigned int bytes_to_read, 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
+} loop_data;
+
+
+/*
+ * Timeout, in milliseconds, for reads from the stream of captured packets.
+ */
+#define CAP_READ_TIMEOUT 250
+
+static void capture_pcap_cb(guchar *, const struct pcap_pkthdr *,
+ const guchar *);
+static void popup_errmsg(const char *);
+static void get_capture_file_io_error(char *, int, const char *, int, gboolean);
+
+
+
+#ifndef _WIN32
+/* 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)
+{
+ if (ld->byte_swapped) {
+ /* Byte-swap the record header fields. */
+ rechdr->ts_sec = BSWAP32(rechdr->ts_sec);
+ rechdr->ts_usec = BSWAP32(rechdr->ts_usec);
+ rechdr->incl_len = BSWAP32(rechdr->incl_len);
+ rechdr->orig_len = BSWAP32(rechdr->orig_len);
+ }
+
+ /* In file format version 2.3, the "incl_len" and "orig_len" fields were
+ swapped, in order to match the BPF header layout.
+
+ Unfortunately, some files were, according to a comment in the "libpcap"
+ source, written with version 2.3 in their headers but without the
+ interchanged fields, so if "incl_len" is greater than "orig_len" - which
+ would make no sense - we assume that we need to swap them. */
+ if (hdr->version_major == 2 &&
+ (hdr->version_minor < 3 ||
+ (hdr->version_minor == 3 && rechdr->incl_len > rechdr->orig_len))) {
+ guint32 temp;
+
+ temp = rechdr->orig_len;
+ rechdr->orig_len = rechdr->incl_len;
+ rechdr->incl_len = temp;
+ }
+}
+
+/* Mimic pcap_open_live() for pipe captures
+ * We check if "pipename" is "-" (stdin) or a FIFO, open it, and read the
+ * header.
+ * N.B. : we can't read the libpcap formats used in RedHat 6.1 or SuSE 6.3
+ * because we can't seek on pipes (see wiretap/libpcap.c for details) */
+static int
+cap_pipe_open_live(char *pipename, struct pcap_hdr *hdr, loop_data *ld,
+ char *errmsg, int errmsgl)
+{
+ struct stat pipe_stat;
+ int fd;
+ guint32 magic;
+ int b, sel_ret;
+ unsigned int bytes_read;
+ fd_set rfds;
+ struct timeval timeout;
+
+ /*
+ * XXX Ethereal blocks until we return
+ */
+ if (strcmp(pipename, "-") == 0)
+ fd = 0; /* read from stdin */
+ else {
+ if (stat(pipename, &pipe_stat) < 0) {
+ if (errno == ENOENT || errno == ENOTDIR)
+ ld->cap_pipe_err = PIPNEXIST;
+ else {
+ g_snprintf(errmsg, errmsgl,
+ "The capture session could not be initiated "
+ "due to error on pipe: %s", strerror(errno));
+ ld->cap_pipe_err = PIPERR;
+ }
+ return -1;
+ }
+ if (! S_ISFIFO(pipe_stat.st_mode)) {
+ if (S_ISCHR(pipe_stat.st_mode)) {
+ /*
+ * Assume the user specified an interface on a system where
+ * interfaces are in /dev. Pretend we haven't seen it.
+ */
+ ld->cap_pipe_err = PIPNEXIST;
+ } else {
+ g_snprintf(errmsg, errmsgl,
+ "The capture session could not be initiated because\n"
+ "\"%s\" is neither an interface nor a pipe", pipename);
+ ld->cap_pipe_err = PIPERR;
+ }
+ return -1;
+ }
+ fd = open(pipename, O_RDONLY | O_NONBLOCK);
+ if (fd == -1) {
+ g_snprintf(errmsg, errmsgl,
+ "The capture session could not be initiated "
+ "due to error on pipe open: %s", strerror(errno));
+ ld->cap_pipe_err = PIPERR;
+ return -1;
+ }
+ }
+
+ ld->from_cap_pipe = TRUE;
+
+ /* read the pcap header */
+ FD_ZERO(&rfds);
+ bytes_read = 0;
+ while (bytes_read < sizeof magic) {
+ FD_SET(fd, &rfds);
+ timeout.tv_sec = 0;
+ timeout.tv_usec = CAP_READ_TIMEOUT*1000;
+ sel_ret = select(fd+1, &rfds, NULL, NULL, &timeout);
+ if (sel_ret < 0) {
+ g_snprintf(errmsg, errmsgl,
+ "Unexpected error from select: %s", strerror(errno));
+ goto error;
+ } else if (sel_ret > 0) {
+ b = read(fd, ((char *)&magic)+bytes_read, sizeof magic-bytes_read);
+ if (b <= 0) {
+ if (b == 0)
+ g_snprintf(errmsg, errmsgl, "End of file on pipe during open");
+ else
+ g_snprintf(errmsg, errmsgl, "Error on pipe during open: %s",
+ strerror(errno));
+ goto error;
+ }
+ bytes_read += b;
+ }
+ }
+
+ switch (magic) {
+ case PCAP_MAGIC:
+ /* Host that wrote it has our byte order, and was running
+ a program using either standard or ss990417 libpcap. */
+ ld->byte_swapped = FALSE;
+ ld->modified = FALSE;
+ break;
+ case PCAP_MODIFIED_MAGIC:
+ /* Host that wrote it has our byte order, but was running
+ a program using either ss990915 or ss991029 libpcap. */
+ ld->byte_swapped = FALSE;
+ ld->modified = TRUE;
+ break;
+ case PCAP_SWAPPED_MAGIC:
+ /* Host that wrote it has a byte order opposite to ours,
+ and was running a program using either standard or
+ ss990417 libpcap. */
+ ld->byte_swapped = TRUE;
+ ld->modified = FALSE;
+ break;
+ case PCAP_SWAPPED_MODIFIED_MAGIC:
+ /* Host that wrote it out has a byte order opposite to
+ ours, and was running a program using either ss990915
+ or ss991029 libpcap. */
+ ld->byte_swapped = TRUE;
+ ld->modified = TRUE;
+ break;
+ default:
+ /* Not a "libpcap" type we know about. */
+ g_snprintf(errmsg, errmsgl, "Unrecognized libpcap format");
+ goto error;
+ }
+
+ /* Read the rest of the header */
+ bytes_read = 0;
+ while (bytes_read < sizeof(struct pcap_hdr)) {
+ FD_SET(fd, &rfds);
+ timeout.tv_sec = 0;
+ timeout.tv_usec = CAP_READ_TIMEOUT*1000;
+ sel_ret = select(fd+1, &rfds, NULL, NULL, &timeout);
+ if (sel_ret < 0) {
+ g_snprintf(errmsg, errmsgl,
+ "Unexpected error from select: %s", strerror(errno));
+ goto error;
+ } else if (sel_ret > 0) {
+ b = read(fd, ((char *)hdr)+bytes_read,
+ sizeof(struct pcap_hdr) - bytes_read);
+ if (b <= 0) {
+ if (b == 0)
+ g_snprintf(errmsg, errmsgl, "End of file on pipe during open");
+ else
+ g_snprintf(errmsg, errmsgl, "Error on pipe during open: %s",
+ strerror(errno));
+ goto error;
+ }
+ bytes_read += b;
+ }
+ }
+
+ if (ld->byte_swapped) {
+ /* Byte-swap the header fields about which we care. */
+ hdr->version_major = BSWAP16(hdr->version_major);
+ hdr->version_minor = BSWAP16(hdr->version_minor);
+ hdr->snaplen = BSWAP32(hdr->snaplen);
+ hdr->network = BSWAP32(hdr->network);
+ }
+
+ if (hdr->version_major < 2) {
+ g_snprintf(errmsg, errmsgl, "Unable to read old libpcap format");
+ goto error;
+ }
+
+ ld->cap_pipe_state = STATE_EXPECT_REC_HDR;
+ ld->cap_pipe_err = PIPOK;
+ return fd;
+
+error:
+ ld->cap_pipe_err = PIPERR;
+ close(fd);
+ return -1;
+
+}
+
+/* We read one record from the pipe, take care of byte order in the record
+ * header, write the record in 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)
+{
+ struct pcap_pkthdr phdr;
+ int b;
+ enum { PD_REC_HDR_READ, PD_DATA_READ, PD_PIPE_EOF, PD_PIPE_ERR,
+ PD_ERR } result;
+
+ switch (ld->cap_pipe_state) {
+
+ case STATE_EXPECT_REC_HDR:
+ ld->bytes_to_read = ld->modified ?
+ sizeof(struct pcaprec_modified_hdr) : sizeof(struct pcaprec_hdr);
+ ld->bytes_read = 0;
+ ld->cap_pipe_state = STATE_READ_REC_HDR;
+ /* Fall through */
+
+ case STATE_READ_REC_HDR:
+ b = read(fd, ((char *)rechdr)+ld->bytes_read,
+ ld->bytes_to_read - ld->bytes_read);
+ if (b <= 0) {
+ if (b == 0)
+ result = PD_PIPE_EOF;
+ else
+ result = PD_PIPE_ERR;
+ break;
+ }
+ if ((ld->bytes_read += b) < ld->bytes_to_read)
+ return 0;
+ result = PD_REC_HDR_READ;
+ break;
+
+ case STATE_EXPECT_DATA:
+ ld->bytes_read = 0;
+ ld->cap_pipe_state = STATE_READ_DATA;
+ /* Fall through */
+
+ case STATE_READ_DATA:
+ b = read(fd, data+ld->bytes_read, rechdr->hdr.incl_len - ld->bytes_read);
+ if (b <= 0) {
+ if (b == 0)
+ result = PD_PIPE_EOF;
+ else
+ result = PD_PIPE_ERR;
+ break;
+ }
+ if ((ld->bytes_read += b) < rechdr->hdr.incl_len)
+ return 0;
+ result = PD_DATA_READ;
+ break;
+
+ default:
+ g_snprintf(errmsg, errmsgl, "cap_pipe_dispatch: invalid state");
+ result = PD_ERR;
+
+ } /* switch (ld->cap_pipe_state) */
+
+ /*
+ * We've now read as much data as we were expecting, so process it.
+ */
+ switch (result) {
+
+ 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) {
+ g_snprintf(errmsg, errmsgl, "Frame %u too long (%d bytes)",
+ ld->counts.total+1, rechdr->hdr.incl_len);
+ break;
+ }
+ ld->cap_pipe_state = STATE_EXPECT_DATA;
+ return 0;
+
+ 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;
+
+ capture_pcap_cb((guchar *)ld, &phdr, data);
+
+ ld->cap_pipe_state = STATE_EXPECT_REC_HDR;
+ return 1;
+
+ case PD_PIPE_EOF:
+ ld->cap_pipe_err = PIPEOF;
+ return -1;
+
+ case PD_PIPE_ERR:
+ g_snprintf(errmsg, errmsgl, "Error reading from pipe: %s",
+ strerror(errno));
+ /* Fall through */
+ case PD_ERR:
+ break;
+ }
+
+ ld->cap_pipe_err = PIPERR;
+ /* Return here rather than inside the switch to prevent GCC warning */
+ return -1;
+}
+#endif /* not _WIN32 */
+
+/*
+ * 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
+capture_loop_start(gboolean *stats_known, struct pcap_stat *stats)
+{
+ pcap_t *pch;
+ int pcap_encap;
+ int file_snaplen;
+ gchar open_err_str[PCAP_ERRBUF_SIZE];
+ gchar lookup_net_err_str[PCAP_ERRBUF_SIZE];
+ bpf_u_int32 netnum, netmask;
+ struct bpf_program fcode;
+ const char *set_linktype_err_str;
+ time_t upd_time, cur_time;
+ time_t start_time;
+ int err, inpkts;
+ condition *cnd_file_duration = NULL;
+ condition *cnd_autostop_files = NULL;
+ condition *cnd_autostop_size = NULL;
+ condition *cnd_autostop_duration = NULL;
+ guint32 autostop_files = 0;
+ char errmsg[4096+1];
+ gboolean write_ok;
+ gboolean close_ok;
+ capture_info capture_ui;
+
+#ifdef _WIN32
+ WORD wVersionRequested;
+ WSADATA wsaData;
+#else
+ fd_set set1;
+ struct timeval timeout;
+ static const char ppamsg[] = "can't find PPA for ";
+ char *libpcap_warn;
+ int sel_ret;
+ int pipe_fd = -1;
+ struct pcap_hdr hdr;
+ struct pcaprec_modified_hdr rechdr;
+ guchar pcap_data[WTAP_MAX_PACKET_SIZE];
+#endif
+#ifdef MUST_DO_SELECT
+ int pcap_fd = 0;
+#endif
+ gboolean show_info = capture_opts.show_info || !capture_opts.sync_mode;
+
+ /* Initialize Windows Socket if we are in a WIN32 OS
+ This needs to be done before querying the interface for network/netmask */
+#ifdef _WIN32
+ /* XXX - do we really require 1.1 or earlier?
+ Are there any versions that support only 2.0 or higher? */
+ wVersionRequested = MAKEWORD(1, 1);
+ err = WSAStartup(wVersionRequested, &wsaData);
+ if (err != 0) {
+ switch (err) {
+
+ case WSASYSNOTREADY:
+ g_snprintf(errmsg, sizeof errmsg,
+ "Couldn't initialize Windows Sockets: Network system not ready for network communication");
+ break;
+
+ case WSAVERNOTSUPPORTED:
+ g_snprintf(errmsg, sizeof errmsg,
+ "Couldn't initialize Windows Sockets: Windows Sockets version %u.%u not supported",
+ LOBYTE(wVersionRequested), HIBYTE(wVersionRequested));
+ break;
+
+ case WSAEINPROGRESS:
+ g_snprintf(errmsg, sizeof errmsg,
+ "Couldn't initialize Windows Sockets: Blocking operation is in progress");
+ break;
+
+ case WSAEPROCLIM:
+ g_snprintf(errmsg, sizeof errmsg,
+ "Couldn't initialize Windows Sockets: Limit on the number of tasks supported by this WinSock implementation has been reached");
+ break;
+
+ case WSAEFAULT:
+ g_snprintf(errmsg, sizeof errmsg,
+ "Couldn't initialize Windows Sockets: Bad pointer passed to WSAStartup");
+ break;
+
+ default:
+ g_snprintf(errmsg, sizeof errmsg,
+ "Couldn't initialize Windows Sockets: error %d", err);
+ break;
+ }
+ pch = NULL;
+ goto error;
+ }
+#endif
+
+ ld.go = TRUE;
+ ld.counts.total = 0;
+ if (capture_opts.has_autostop_packets)
+ ld.max = capture_opts.autostop_packets;
+ else
+ ld.max = 0; /* no limit */
+ ld.err = 0; /* no error seen yet */
+ ld.linktype = WTAP_ENCAP_UNKNOWN;
+ ld.pcap_err = FALSE;
+ ld.from_cap_pipe = FALSE;
+ ld.sync_packets = 0;
+ ld.counts.sctp = 0;
+ ld.counts.tcp = 0;
+ ld.counts.udp = 0;
+ ld.counts.icmp = 0;
+ ld.counts.ospf = 0;
+ ld.counts.gre = 0;
+ ld.counts.ipx = 0;
+ ld.counts.netbios = 0;
+ ld.counts.vines = 0;
+ ld.counts.other = 0;
+ ld.counts.arp = 0;
+ ld.pdh = NULL;
+
+ /* We haven't yet gotten the capture statistics. */
+ *stats_known = FALSE;
+
+ /* Open the network interface to capture from it.
+ Some versions of libpcap may put warnings into the error buffer
+ if they succeed; to tell if that's happened, we have to clear
+ the error buffer, and check if it's still a null string. */
+ open_err_str[0] = '\0';
+ pch = pcap_open_live(cfile.iface,
+ capture_opts.has_snaplen ? capture_opts.snaplen :
+ WTAP_MAX_PACKET_SIZE,
+ capture_opts.promisc_mode, CAP_READ_TIMEOUT,
+ open_err_str);
+
+ if (pch != NULL) {
+#ifdef _WIN32
+ /* try to set the capture buffer size */
+ if (pcap_setbuff(pch, 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"
+ "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);
+ }
+#endif
+
+ /* setting the data link type only works on real interfaces */
+ if (capture_opts.linktype != -1) {
+ set_linktype_err_str = set_pcap_linktype(pch, cfile.iface,
+ capture_opts.linktype);
+ if (set_linktype_err_str != NULL) {
+ g_snprintf(errmsg, sizeof errmsg, "Unable to set data link type (%s).",
+ set_linktype_err_str);
+ goto error;
+ }
+ }
+ } else {
+ /* We couldn't open "cfile.iface" as a network device. */
+#ifdef _WIN32
+ /* On Windows, we don't support capturing on pipes, so we give up.
+ If this is a child process that does the capturing in sync
+ mode or fork mode, it shouldn't do any UI stuff until we pop up the
+ capture-progress window, and, since we couldn't start the
+ capture, we haven't popped it up. */
+ if (!capture_child) {
+ main_window_update();
+ }
+
+ /* 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. */
+ g_snprintf(errmsg, sizeof errmsg,
+ "The capture session could not be initiated (%s).\n"
+ "Please check that you have the proper interface specified.\n"
+ "\n"
+ "Note that the WinPcap 2.x version of the driver Ethereal uses for packet\n"
+ "capture on Windows doesn't support capturing on PPP/WAN interfaces in\n"
+ "Windows NT/2000/XP/2003 Server, and that the WinPcap 3.0 and later versions\n"
+ "don't support capturing on PPP/WAN interfaces at all.",
+ open_err_str);
+ goto error;
+#else
+ /* try to open cfile.iface as a pipe */
+ pipe_fd = cap_pipe_open_live(cfile.iface, &hdr, &ld, errmsg, sizeof errmsg);
+
+ if (pipe_fd == -1) {
+
+ /* If this is a child process that does the capturing in sync
+ * mode or fork mode, it shouldn't do any UI stuff until we pop up the
+ * capture-progress window, and, since we couldn't start the
+ * capture, we haven't popped it up.
+ */
+ if (!capture_child) {
+ main_window_update();
+ }
+
+ 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
+ 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"). */
+ 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"
+ "that doesn't handle HP-UX network devices well; this means that\n"
+ "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"
+ "packaged binary form from the Software Porting And Archive Centre\n"
+ "for HP-UX; the Centre is at http://hpux.connect.org.uk/ - the page\n"
+ "at the URL lists a number of mirror sites.";
+ else
+ libpcap_warn = "";
+ g_snprintf(errmsg, sizeof errmsg,
+ "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);
+ }
+ /*
+ * Else pipe (or file) does exist and cap_pipe_open_live() has
+ * filled in errmsg
+ */
+ goto error;
+ } else
+ /* cap_pipe_open_live() succeeded; don't want
+ error message from pcap_open_live() */
+ open_err_str[0] = '\0';
+#endif
+ }
+
+ /* capture filters only work on real interfaces */
+ if (cfile.cfilter && !ld.from_cap_pipe) {
+ /* A capture filter was specified; set it up. */
+ if (pcap_lookupnet(cfile.iface, &netnum, &netmask, lookup_net_err_str) < 0) {
+ /*
+ * Well, we can't get the netmask for this interface; it's used
+ * only for filters that check for broadcast IP addresses, so
+ * we just punt and use 0. It might be nice to warn the user,
+ * but that's a pain in a GUI application, as it'd involve popping
+ * up a message box, and it's not clear how often this would make
+ * a difference (only filters that check for IP broadcast addresses
+ * use the netmask).
+ */
+ netmask = 0;
+ }
+ if (pcap_compile(pch, &fcode, cfile.cfilter, 1, netmask) < 0) {
+ dfilter_t *rfcode = NULL;
+ /* filter string invalid, did the user tried a display filter? */
+ if (dfilter_compile(cfile.cfilter, &rfcode) && rfcode != NULL) {
+ g_snprintf(errmsg, sizeof errmsg,
+ "%sInvalid capture filter: \"%s\"!%s\n"
+ "\n"
+ "That string looks like a valid display filter; however, it is not 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(), cfile.cfilter, simple_dialog_primary_end(),
+ pcap_geterr(pch));
+ dfilter_free(rfcode);
+ } else {
+ g_snprintf(errmsg, sizeof errmsg,
+ "%sInvalid capture filter: \"%s\"!%s\n"
+ "\n"
+ "That string is not a valid capture filter (%s).\n"
+ "See the help for a description of the capture filter syntax.",
+ simple_dialog_primary_start(), cfile.cfilter, simple_dialog_primary_end(),
+ pcap_geterr(pch));
+ }
+ goto error;
+ }
+ if (pcap_setfilter(pch, &fcode) < 0) {
+ g_snprintf(errmsg, sizeof errmsg, "Can't install filter (%s).",
+ pcap_geterr(pch));
+ goto error;
+ }
+ }
+
+ /* Set up to write to the capture file. */
+#ifndef _WIN32
+ if (ld.from_cap_pipe) {
+ pcap_encap = hdr.network;
+ file_snaplen = hdr.snaplen;
+ } else
+#endif
+ {
+ pcap_encap = get_pcap_linktype(pch, cfile.iface);
+ file_snaplen = pcap_snapshot(pch);
+ }
+ ld.linktype = wtap_pcap_encap_to_wtap_encap(pcap_encap);
+ if (ld.linktype == WTAP_ENCAP_UNKNOWN) {
+ g_snprintf(errmsg, sizeof errmsg,
+ "The network you're capturing from is of a type"
+ " that Ethereal doesn't support (data link type %d).", pcap_encap);
+ goto error;
+ }
+ if (capture_opts.multi_files_on) {
+ ld.pdh = ringbuf_init_wtap_dump_fdopen(WTAP_FILE_PCAP, ld.linktype,
+ file_snaplen, &err);
+ } else {
+ ld.pdh = wtap_dump_fdopen(cfile.save_file_fd, WTAP_FILE_PCAP,
+ ld.linktype, file_snaplen, &err);
+ }
+
+ if (ld.pdh == NULL) {
+ /* We couldn't set up to write to the capture file. */
+ switch (err) {
+
+ case WTAP_ERR_CANT_OPEN:
+ strcpy(errmsg, "The file to which the capture would be saved"
+ " couldn't be created for some unknown reason.");
+ break;
+
+ case WTAP_ERR_SHORT_WRITE:
+ strcpy(errmsg, "A full header couldn't be written to the file"
+ " to which the capture would be saved.");
+ break;
+
+ default:
+ if (err < 0) {
+ g_snprintf(errmsg, sizeof(errmsg),
+ "The file to which the capture would be"
+ " saved (\"%s\") could not be opened: Error %d.",
+ cfile.save_file, err);
+ } else {
+ g_snprintf(errmsg, sizeof(errmsg),
+ "The file to which the capture would be"
+ " saved (\"%s\") could not be opened: %s.",
+ cfile.save_file, strerror(err));
+ }
+ break;
+ }
+ goto error;
+ }
+
+ /* 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);
+
+ /* 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. */
+
+ if (capture_child) {
+ /* Well, we should be able to start capturing.
+
+ This is the child process for a sync mode capture, so 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. */
+ fflush(wtap_dump_file(ld.pdh));
+ sync_pipe_capstart_to_parent();
+ }
+
+ /* start capture info dialog */
+ if(show_info) {
+ capture_ui.callback_data = &ld;
+ capture_ui.counts = &ld.counts;
+ capture_info_create(&capture_ui, cfile.iface);
+ }
+
+ start_time = time(NULL);
+ upd_time = time(NULL);
+#ifdef MUST_DO_SELECT
+ if (!ld.from_cap_pipe) pcap_fd = pcap_fileno(pch);
+#endif
+
+ /* initialize capture stop conditions */
+ init_capture_stop_conditions();
+ /* create stop conditions */
+ if (capture_opts.has_autostop_filesize)
+ cnd_autostop_size =
+ cnd_new(CND_CLASS_CAPTURESIZE,(long)capture_opts.autostop_filesize);
+ if (capture_opts.has_autostop_duration)
+ cnd_autostop_duration =
+ cnd_new(CND_CLASS_TIMEOUT,(gint32)capture_opts.autostop_duration);
+
+ if (capture_opts.multi_files_on) {
+ if (capture_opts.has_file_duration)
+ cnd_file_duration =
+ cnd_new(CND_CLASS_TIMEOUT, capture_opts.file_duration);
+
+ if (capture_opts.has_autostop_files)
+ cnd_autostop_files =
+ cnd_new(CND_CLASS_CAPTURESIZE, capture_opts.autostop_files);
+ }
+
+ /* WOW, everything is prepared! */
+ /* please fasten your seat belts, we will enter now the actual capture loop */
+ while (ld.go) {
+ main_window_update();
+
+#ifndef _WIN32
+ if (ld.from_cap_pipe) {
+ FD_ZERO(&set1);
+ FD_SET(pipe_fd, &set1);
+ timeout.tv_sec = 0;
+ timeout.tv_usec = CAP_READ_TIMEOUT*1000;
+ sel_ret = select(pipe_fd+1, &set1, NULL, NULL, &timeout);
+ if (sel_ret <= 0) {
+ inpkts = 0;
+ if (sel_ret < 0 && errno != EINTR) {
+ g_snprintf(errmsg, sizeof(errmsg),
+ "Unexpected error from select: %s", strerror(errno));
+ popup_errmsg(errmsg);
+ ld.go = FALSE;
+ }
+ } else {
+ /*
+ * "select()" says we can read from the pipe without blocking
+ */
+ inpkts = cap_pipe_dispatch(pipe_fd, &ld, &hdr, &rechdr, pcap_data,
+ errmsg, sizeof errmsg);
+ if (inpkts < 0) {
+ ld.go = FALSE;
+ }
+ }
+ }
+ else
+#endif /* _WIN32 */
+ {
+#ifdef MUST_DO_SELECT
+ /*
+ * Sigh. The semantics of the read timeout argument to
+ * "pcap_open_live()" aren't particularly well specified by
+ * the "pcap" man page - at least with the BSD BPF code, the
+ * intent appears to be, at least in part, a way of cutting
+ * down the number of reads done on a capture, by blocking
+ * until the buffer fills or a timer expires - and the Linux
+ * libpcap doesn't actually support it, so we can't use it
+ * to break out of the "pcap_dispatch()" every 1/4 of a second
+ * or so. Linux's libpcap is not the only libpcap that doesn't
+ * support the read timeout.
+ *
+ * Furthermore, at least on Solaris, the bufmod STREAMS module's
+ * read timeout won't go off if no data has arrived, i.e. it cannot
+ * be used to guarantee that a read from a DLPI stream will return
+ * within a specified amount of time regardless of whether any
+ * data arrives or not.
+ *
+ * Thus, on all platforms other than BSD, we do a "select()" on the
+ * file descriptor for the capture, with a timeout of CAP_READ_TIMEOUT
+ * milliseconds, or CAP_READ_TIMEOUT*1000 microseconds.
+ *
+ * "select()", on BPF devices, doesn't work as you might expect;
+ * at least on some versions of some flavors of BSD, the timer
+ * doesn't start until a read is done, so it won't expire if
+ * only a "select()" or "poll()" is posted.
+ */
+ FD_ZERO(&set1);
+ FD_SET(pcap_fd, &set1);
+ timeout.tv_sec = 0;
+ timeout.tv_usec = CAP_READ_TIMEOUT*1000;
+ sel_ret = select(pcap_fd+1, &set1, NULL, NULL, &timeout);
+ if (sel_ret > 0) {
+ /*
+ * "select()" says we can read from it without blocking; go for
+ * it.
+ */
+ inpkts = pcap_dispatch(pch, 1, capture_pcap_cb, (guchar *) &ld);
+ if (inpkts < 0) {
+ ld.pcap_err = TRUE;
+ ld.go = FALSE;
+ }
+ } else {
+ inpkts = 0;
+ if (sel_ret < 0 && errno != EINTR) {
+ g_snprintf(errmsg, sizeof(errmsg),
+ "Unexpected error from select: %s", strerror(errno));
+ popup_errmsg(errmsg);
+ ld.go = FALSE;
+ }
+ }
+#else
+ inpkts = pcap_dispatch(pch, 1, capture_pcap_cb, (guchar *) &ld);
+ if (inpkts < 0) {
+ ld.pcap_err = TRUE;
+ ld.go = FALSE;
+ }
+#endif /* MUST_DO_SELECT */
+ }
+
+ if (inpkts > 0) {
+ ld.sync_packets += inpkts;
+
+ /* check capture size condition */
+ if (cnd_autostop_size != NULL && cnd_eval(cnd_autostop_size,
+ (guint32)wtap_get_bytes_dumped(ld.pdh))){
+ /* 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 */
+ ld.go = FALSE;
+ continue;
+ }
+
+ /* Switch to the next ringbuffer file */
+ if (ringbuf_switch_file(&cfile, &ld.pdh, &ld.err)) {
+ /* File switch succeeded: reset the conditions */
+ cnd_reset(cnd_autostop_size);
+ if (cnd_file_duration) {
+ cnd_reset(cnd_file_duration);
+ }
+ } else {
+ /* File switch failed: stop here */
+ ld.go = FALSE;
+ continue;
+ }
+ } else {
+ /* single file, stop now */
+ ld.go = FALSE;
+ continue;
+ }
+ } /* cnd_autostop_size */
+ }
+
+ /* Only update once a second so as not to overload slow displays */
+ cur_time = time(NULL);
+ if (cur_time > upd_time) {
+ upd_time = cur_time;
+
+ /*if (pcap_stats(pch, stats) >= 0) {
+ *stats_known = TRUE;
+ }*/
+
+ /* Let the parent process know. */
+ /* calculate and display running time */
+ if(show_info) {
+ cur_time -= start_time;
+ capture_ui.running_time = cur_time;
+ capture_ui.new_packets = ld.sync_packets;
+ capture_info_update(&capture_ui);
+ }
+
+ if (ld.sync_packets) {
+ /* do sync here */
+ fflush(wtap_dump_file(ld.pdh));
+
+ if (capture_child) {
+ /* This is the child process for a sync mode capture, so 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.sync_packets);
+ }
+
+ ld.sync_packets = 0;
+ }
+
+ /* check capture duration condition */
+ if (cnd_autostop_duration != NULL && cnd_eval(cnd_autostop_duration)) {
+ /* The maximum capture time has elapsed; stop the capture. */
+ ld.go = FALSE;
+ continue;
+ }
+
+ /* check capture file 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)) {
+ /* no files left: stop here */
+ ld.go = FALSE;
+ continue;
+ }
+
+ /* Switch to the next ringbuffer file */
+ if (ringbuf_switch_file(&cfile, &ld.pdh, &ld.err)) {
+ /* file switch succeeded: reset the conditions */
+ cnd_reset(cnd_file_duration);
+ if(cnd_autostop_size)
+ cnd_reset(cnd_autostop_size);
+ } else {
+ /* File switch failed: stop here */
+ ld.go = FALSE;
+ continue;
+ }
+ } else {
+ /* single file, stop now */
+ ld.go = FALSE;
+ continue;
+ }
+ } /* cnd_file_duration */
+ }
+
+ } /* while (ld.go) */
+
+ /* delete stop conditions */
+ if (cnd_file_duration != NULL)
+ cnd_delete(cnd_file_duration);
+ if (cnd_autostop_files != NULL)
+ cnd_delete(cnd_autostop_files);
+ if (cnd_autostop_size != NULL)
+ cnd_delete(cnd_autostop_size);
+ if (cnd_autostop_duration != NULL)
+ cnd_delete(cnd_autostop_duration);
+
+ if (ld.pcap_err) {
+ g_snprintf(errmsg, sizeof(errmsg), "Error while capturing packets: %s",
+ pcap_geterr(pch));
+ popup_errmsg(errmsg);
+#ifdef _WIN32
+ }
+#else
+ } else if (ld.from_cap_pipe && ld.cap_pipe_err == PIPERR)
+ popup_errmsg(errmsg);
+#endif
+
+ if (ld.err == 0)
+ write_ok = TRUE;
+ else {
+ get_capture_file_io_error(errmsg, sizeof(errmsg), cfile.save_file, ld.err,
+ FALSE);
+ popup_errmsg(errmsg);
+ write_ok = FALSE;
+ }
+
+ if (capture_opts.multi_files_on) {
+ close_ok = ringbuf_wtap_dump_close(&cfile, &err);
+ } else {
+ close_ok = wtap_dump_close(ld.pdh, &err);
+ }
+ /* 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) {
+ get_capture_file_io_error(errmsg, sizeof(errmsg), cfile.save_file, err,
+ TRUE);
+ popup_errmsg(errmsg);
+ }
+ /* Set write_ok to mean the write and the close were successful. */
+ write_ok = (write_ok && close_ok);
+
+#ifndef _WIN32
+ /*
+ * XXX We exhibit different behaviour between normal mode and sync mode
+ * when the pipe is stdin and not already at EOF. If we're a child, the
+ * parent's stdin isn't closed, so if the user starts another capture,
+ * cap_pipe_open_live() will very likely not see the expected magic bytes and
+ * will say "Unrecognized libpcap format". On the other hand, in normal
+ * mode, cap_pipe_open_live() will say "End of file on pipe during open".
+ */
+ if (ld.from_cap_pipe && pipe_fd >= 0)
+ close(pipe_fd);
+ else
+#endif
+ {
+ /* Get the capture statistics, so we know how many packets were
+ dropped. */
+ if (pcap_stats(pch, stats) >= 0) {
+ *stats_known = TRUE;
+ if (capture_child) {
+ /* Let the parent process know. */
+ sync_pipe_drops_to_parent(stats->ps_drop);
+ }
+ } else {
+ g_snprintf(errmsg, sizeof(errmsg),
+ "Can't get packet-drop statistics: %s",
+ pcap_geterr(pch));
+ popup_errmsg(errmsg);
+ }
+ pcap_close(pch);
+ }
+
+#ifdef _WIN32
+ /* Shut down windows sockets */
+ WSACleanup();
+#endif
+
+ if(show_info) {
+ capture_info_destroy(&capture_ui);
+ }
+
+ return write_ok;
+
+error:
+ if (capture_opts.multi_files_on) {
+ /* cleanup ringbuffer */
+ ringbuf_error_cleanup();
+ } else {
+ /* We can't use the save file, and we have no wtap_dump stream
+ to close in order to close it, so close the FD directly. */
+ close(cfile.save_file_fd);
+
+ /* We couldn't even start the capture, so get rid of the capture
+ file. */
+ unlink(cfile.save_file); /* silently ignore error */
+ g_free(cfile.save_file);
+ }
+ cfile.save_file = NULL;
+ popup_errmsg(errmsg);
+
+#ifndef _WIN32
+ if (ld.from_cap_pipe) {
+ if (pipe_fd >= 0)
+ close(pipe_fd);
+ } else
+#endif
+ {
+ if (pch != NULL)
+ pcap_close(pch);
+ }
+
+ return FALSE;
+}
+
+
+void capture_loop_stop(void)
+{
+ ld.go = FALSE;
+}
+
+
+static void
+get_capture_file_io_error(char *errmsg, int errmsglen, const char *fname,
+ int err, gboolean is_close)
+{
+ switch (err) {
+
+ case ENOSPC:
+ g_snprintf(errmsg, errmsglen,
+ "Not all the packets could be written to the file"
+ " to which the capture was being saved\n"
+ "(\"%s\") because there is no space left on the file system\n"
+ "on which that file resides.",
+ fname);
+ break;
+
+#ifdef EDQUOT
+ case EDQUOT:
+ g_snprintf(errmsg, errmsglen,
+ "Not all the packets could be written to the file"
+ " to which the capture was being saved\n"
+ "(\"%s\") because you are too close to, or over,"
+ " your disk quota\n"
+ "on the file system on which that file resides.",
+ fname);
+ break;
+#endif
+
+ case WTAP_ERR_CANT_CLOSE:
+ g_snprintf(errmsg, errmsglen,
+ "The file to which the capture was being saved"
+ " couldn't be closed for some unknown reason.");
+ break;
+
+ case WTAP_ERR_SHORT_WRITE:
+ g_snprintf(errmsg, errmsglen,
+ "Not all the packets could be written to the file"
+ " to which the capture was being saved\n"
+ "(\"%s\").",
+ fname);
+ break;
+
+ default:
+ if (is_close) {
+ g_snprintf(errmsg, errmsglen,
+ "The file to which the capture was being saved\n"
+ "(\"%s\") could not be closed: %s.",
+ fname, wtap_strerror(err));
+ } else {
+ g_snprintf(errmsg, errmsglen,
+ "An error occurred while writing to the file"
+ " to which the capture was being saved\n"
+ "(\"%s\"): %s.",
+ fname, wtap_strerror(err));
+ }
+ break;
+ }
+}
+
+static void
+popup_errmsg(const char *errmsg)
+{
+ if (capture_child) {
+ /* This is the child process for a sync mode capture.
+ Send the error message to our parent, so they can display a
+ dialog box containing it. */
+ sync_pipe_errmsg_to_parent(errmsg);
+ } else {
+ /* Display the dialog box ourselves; there's no parent. */
+ simple_dialog(ESD_TYPE_ERROR, ESD_BTN_OK, "%s", errmsg);
+ }
+}
+
+
+/* one packet was captured, process it */
+static void
+capture_pcap_cb(guchar *user, const struct pcap_pkthdr *phdr,
+ const guchar *pd)
+{
+ struct wtap_pkthdr whdr;
+ union wtap_pseudo_header pseudo_header;
+ loop_data *ld = (loop_data *) user;
+ int err;
+
+ /* user told us to stop after x packets, do we have enough? */
+ if ((++ld->counts.total >= ld->max) && (ld->max > 0))
+ {
+ 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->linktype, phdr, pd, &pseudo_header,
+ &whdr, &err);
+ if (pd == NULL) {
+ ld->go = FALSE;
+ ld->err = err;
+ return;
+ }
+
+ 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->pdh, &whdr, &pseudo_header, pd, &err)) {
+ ld->go = FALSE;
+ ld->err = err;
+ }
+ }
+
+ switch (ld->linktype) {
+ case WTAP_ENCAP_ETHERNET:
+ capture_eth(pd, 0, whdr.caplen, &ld->counts);
+ break;
+ case WTAP_ENCAP_FDDI:
+ case WTAP_ENCAP_FDDI_BITSWAPPED:
+ capture_fddi(pd, whdr.caplen, &ld->counts);
+ break;
+ case WTAP_ENCAP_PRISM_HEADER:
+ capture_prism(pd, 0, whdr.caplen, &ld->counts);
+ break;
+ case WTAP_ENCAP_TOKEN_RING:
+ capture_tr(pd, 0, whdr.caplen, &ld->counts);
+ break;
+ case WTAP_ENCAP_NULL:
+ capture_null(pd, whdr.caplen, &ld->counts);
+ break;
+ case WTAP_ENCAP_PPP:
+ capture_ppp_hdlc(pd, 0, whdr.caplen, &ld->counts);
+ break;
+ case WTAP_ENCAP_RAW_IP:
+ capture_raw(pd, whdr.caplen, &ld->counts);
+ break;
+ case WTAP_ENCAP_SLL:
+ capture_sll(pd, whdr.caplen, &ld->counts);
+ break;
+ case WTAP_ENCAP_LINUX_ATM_CLIP:
+ capture_clip(pd, whdr.caplen, &ld->counts);
+ break;
+ case WTAP_ENCAP_IEEE_802_11:
+ case WTAP_ENCAP_IEEE_802_11_WITH_RADIO:
+ capture_ieee80211(pd, 0, whdr.caplen, &ld->counts);
+ break;
+ case WTAP_ENCAP_CHDLC:
+ capture_chdlc(pd, 0, whdr.caplen, &ld->counts);
+ break;
+ case WTAP_ENCAP_LOCALTALK:
+ capture_llap(&ld->counts);
+ break;
+ case WTAP_ENCAP_ATM_PDUS:
+ capture_atm(&pseudo_header, pd, whdr.caplen, &ld->counts);
+ break;
+ case WTAP_ENCAP_IP_OVER_FC:
+ capture_ipfc(pd, whdr.caplen, &ld->counts);
+ break;
+ case WTAP_ENCAP_ARCNET:
+ capture_arcnet(pd, whdr.caplen, &ld->counts, FALSE, TRUE);
+ break;
+ case WTAP_ENCAP_ARCNET_LINUX:
+ capture_arcnet(pd, whdr.caplen, &ld->counts, TRUE, FALSE);
+ break;
+ case WTAP_ENCAP_APPLE_IP_OVER_IEEE1394:
+ capture_ap1394(pd, 0, whdr.caplen, &ld->counts);
+ break;
+ /* XXX - some ATM drivers on FreeBSD might prepend a 4-byte ATM
+ pseudo-header to DLT_ATM_RFC1483, with LLC header following;
+ we might have to implement that at some point. */
+ }
+}
+
+#endif /* HAVE_LIBPCAP */
+
diff --git a/epan/packet.h b/epan/packet.h
index 6d52783431..7fcc67c929 100644
--- a/epan/packet.h
+++ b/epan/packet.h
@@ -75,6 +75,9 @@ typedef struct _packet_counts {
gint arp;
} packet_counts;
+/** Number of packet counts. */
+#define PACKET_COUNTS_SIZE sizeof(packet_counts) / sizeof (gint)
+
/* Types of character encodings */
typedef enum {
CHAR_ASCII = 0, /* ASCII */
diff --git a/gtk/capture_info_dlg.c b/gtk/capture_info_dlg.c
index 44d4807d61..d155294824 100644
--- a/gtk/capture_info_dlg.c
+++ b/gtk/capture_info_dlg.c
@@ -54,7 +54,7 @@ typedef struct {
typedef struct {
GtkWidget *cap_w;
GtkWidget *running_time_lb;
- capture_info_counts_t counts[CAPTURE_PACKET_COUNTS];
+ capture_info_counts_t counts[PACKET_COUNTS_SIZE];
} capture_info_ui_t;
@@ -130,7 +130,7 @@ gchar *iface)
gtk_widget_show(counts_fr);
/* Individual statistic elements */
- counts_tb = gtk_table_new(CAPTURE_PACKET_COUNTS, 4, TRUE);
+ counts_tb = gtk_table_new(PACKET_COUNTS_SIZE, 4, TRUE);
gtk_container_add(GTK_CONTAINER(counts_fr), counts_tb);
gtk_container_border_width(GTK_CONTAINER(counts_tb), 5);
gtk_widget_show(counts_tb);
@@ -138,7 +138,7 @@ gchar *iface)
gtk_table_set_row_spacings(GTK_TABLE(counts_tb), 0);
gtk_table_set_col_spacings(GTK_TABLE(counts_tb), 5);
- for (i = 0; i < CAPTURE_PACKET_COUNTS; i++) {
+ for (i = 0; i < PACKET_COUNTS_SIZE; i++) {
info->counts[i].label = gtk_label_new(info->counts[i].title);
gtk_misc_set_alignment(GTK_MISC(info->counts[i].label), 0.0f, 0.5f);
@@ -238,7 +238,7 @@ capture_info *cinfo)
if (cinfo->new_packets) {
- for (i = 0; i < CAPTURE_PACKET_COUNTS; i++) {
+ for (i = 0; i < PACKET_COUNTS_SIZE; i++) {
g_snprintf(label_str, sizeof(label_str), "%d",
*info->counts[i].value_ptr);
gtk_label_set(GTK_LABEL(info->counts[i].value_lb), label_str);
diff --git a/gtk/main.c b/gtk/main.c
index 9ec98b499e..7fce1be758 100644
--- a/gtk/main.c
+++ b/gtk/main.c
@@ -2516,7 +2516,7 @@ main(int argc, char *argv[])
display_queued_messages();
/* XXX - hand these stats to the parent process */
- capture(&stats_known, &stats);
+ capture_start(&stats_known, &stats);
/* The capture is done; there's nothing more for us to do. */
gtk_exit(0);