#include <unistd.h>
#endif
-#include <stdlib.h>
+#include <stdio.h>
#include <string.h>
-#include <ctype.h>
-
-#ifdef HAVE_FCNTL_H
-#include <fcntl.h>
-#endif
-
-#ifdef HAVE_SYS_TYPES_H
-#include <sys/types.h>
-#endif
-
-#ifdef HAVE_NETINET_IN_H
-#include <netinet/in.h>
-#endif
-
-#ifdef HAVE_NETDB_H
-#include <netdb.h>
-#endif
-
-#ifdef HAVE_ARPA_INET_H
-#include <arpa/inet.h>
-#endif
-
-#ifdef HAVE_SYS_SOCKET_H
-#include <sys/socket.h> /* needed to define AF_ values on UNIX */
-#endif
-
-#ifdef HAVE_WINSOCK2_H
-#include <winsock2.h> /* needed to define AF_ values on Windows */
-#endif
-
-#ifdef NEED_INET_V6DEFS_H
-# include "inet_v6defs.h"
-#endif
-
-#include <signal.h>
-#include <errno.h>
#include <glib.h>
#include <epan/dfilter/dfilter.h>
#include "file.h"
#include "capture.h"
+#include "capture_ifinfo.h"
#include "capture_sync.h"
#include "capture_info.h"
#include "capture_ui_utils.h"
#include "util.h"
#include "capture-pcap-util.h"
-#include "alert_box.h"
#include "simple_dialog.h"
#include <epan/prefs.h>
capture_start(capture_options *capture_opts)
{
gboolean ret;
-
+ GString *source = g_string_new("");
/* close the currently loaded capture file */
cf_close(capture_opts->cf);
g_log(LOG_DOMAIN_CAPTURE, G_LOG_LEVEL_MESSAGE, "Capture Start ...");
+ g_string_printf(source, "%s", get_iface_description(capture_opts));
+ if(capture_opts->cfilter && capture_opts->cfilter[0]) {
+ g_string_append_printf(source, " (%s)", capture_opts->cfilter);
+ }
+ cf_set_tempfile_source(capture_opts->cf, source->str);
+ g_string_free(source, TRUE);
+
/* try to start the capture child process */
ret = sync_pipe_start(capture_opts);
if(!ret) {
capture_opts->state = CAPTURE_STOPPED;
} else {
/* the capture child might not respond shortly after bringing it up */
- /* (especially it will block, if no input coming from an input capture pipe (e.g. mkfifo) is coming in) */
+ /* (for example: it will block if no input arrives from an input capture pipe (e.g. mkfifo)) */
- /* to prevent problems, bring the main GUI into "capture mode" right after successfully */
- /* spawn/exec the capture child, without waiting for any response from it */
+ /* to prevent problems, bring the main GUI into "capture mode" right after a successful */
+ /* spawn/exec of the capture child, without waiting for any response from it */
capture_callback_invoke(capture_cb_capture_prepared, capture_opts);
if(capture_opts->show_info)
-/* We've succeeded a (non real-time) capture, try to read it into a new capture file */
+/* We've succeeded in doing a (non real-time) capture; try to read it into a new capture file */
static gboolean
capture_input_read_all(capture_options *capture_opts, gboolean is_tempfile, gboolean drops_known,
guint32 drops)
{
int err;
-
/* Capture succeeded; attempt to open the capture file. */
if (cf_open(capture_opts->cf, capture_opts->save_file, is_tempfile, &err) != CF_OK) {
- /* We're not doing a capture any more, so we don't have a save
- file. */
+ /* We're not doing a capture any more, so we don't have a save file. */
return FALSE;
}
-
+
/* Set the read filter to NULL. */
- /* XXX - this is odd here, try to put it somewhere, where it fits better */
+ /* XXX - this is odd here; try to put it somewhere where it fits better */
cf_set_rfcode(capture_opts->cf, NULL);
/* Get the packet-drop statistics.
}
/* read in the packet data */
- switch (cf_read(capture_opts->cf)) {
+ switch (cf_read(capture_opts->cf, FALSE)) {
case CF_READ_OK:
case CF_READ_ERROR:
return FALSE;
}
- /* if we didn't captured even a single packet, close the file again */
+ /* if we didn't capture even a single packet, close the file again */
if(cf_get_packet_count(capture_opts->cf) == 0 && !capture_opts->restart) {
simple_dialog(ESD_TYPE_INFO, ESD_BTN_OK,
"%sNo packets captured!%s\n"
gboolean is_tempfile;
int err;
-
if(capture_opts->state == CAPTURE_PREPARING) {
g_log(LOG_DOMAIN_CAPTURE, G_LOG_LEVEL_MESSAGE, "Capture started!");
}
/* free the old filename */
if(capture_opts->save_file != NULL) {
- /* we start a new capture file, close the old one (if we had one before) */
+ /* we start a new capture file, close the old one (if we had one before). */
/* (we can only have an open capture file in real_time_mode!) */
if( ((capture_file *) capture_opts->cf)->state != FILE_CLOSED) {
capture_callback_invoke(capture_cb_capture_update_finished, capture_opts);
is_tempfile = FALSE;
cf_set_tempfile(capture_opts->cf, FALSE);
} else {
- /* we didn't had a save_file before, must be a tempfile */
+ /* we didn't have a save_file before; must be a tempfile */
is_tempfile = TRUE;
cf_set_tempfile(capture_opts->cf, TRUE);
}
break;
}
} else {
- /* increase capture file packet counter by the number or incoming packets */
+ /* increase the capture file packet counter by the number of incoming packets */
cf_set_packet_count(capture_opts->cf,
cf_get_packet_count(capture_opts->cf) + to_read);
+ cf_fake_continue_tail(capture_opts->cf);
capture_callback_invoke(capture_cb_capture_fixed_continue, capture_opts);
}
- /* update the main window, so we get events (e.g. from the stop toolbar button) */
+ /* update the main window so we get events (e.g. from the stop toolbar button) */
main_window_update();
if(capture_opts->show_info)
/* capture child closed its side of the pipe, do the required cleanup */
void
-capture_input_closed(capture_options *capture_opts)
+capture_input_closed(capture_options *capture_opts, gchar *msg)
{
int err;
int packet_count_save;
g_log(LOG_DOMAIN_CAPTURE, G_LOG_LEVEL_MESSAGE, "Capture stopped!");
g_assert(capture_opts->state == CAPTURE_PREPARING || capture_opts->state == CAPTURE_RUNNING);
- /* if we didn't started the capture, do a fake start */
- /* (happens if we got an error message - we won't get a filename then) */
+ if (msg != NULL)
+ simple_dialog(ESD_TYPE_ERROR, ESD_BTN_OK, "%s", msg);
+
+ /* if we didn't start the capture, do a fake start. */
+ /* (happens if we got an error message - we won't get a filename then). */
if(capture_opts->state == CAPTURE_PREPARING) {
if(capture_opts->real_time_mode) {
capture_callback_invoke(capture_cb_capture_update_started, capture_opts);
/* XXX: If -Q (quit-after-cap) then cf->count clr'd below so save it first */
packet_count_save = cf_get_packet_count(capture_opts->cf);
- /* Tell the GUI, we are not doing a capture any more.
- Must be done after the cf_finish_tail(), so file lengths are displayed
- correct. */
+ /* Tell the GUI we are not doing a capture any more.
+ Must be done after the cf_finish_tail(), so file lengths are
+ correctly displayed */
capture_callback_invoke(capture_cb_capture_update_finished, capture_opts);
/* Finish the capture. */
}
}
-/**
- * Fetch the interface list from a child process (dumpcap).
- *
- * @return A GList containing if_info_t structs if successful, NULL (with err and possibly err_str set) otherwise.
- *
- */
-
-/* XXX - We parse simple text output to get our interface list. Should
- * we use "real" data serialization instead, e.g. via XML? */
-GList *
-capture_interface_list(int *err, char **err_str)
-{
- GList *if_list = NULL;
- int i, j;
- gchar *msg;
- gchar **raw_list, **if_parts, **addr_parts;
- gchar *name;
- if_info_t *if_info;
- if_addr_t *if_addr;
-
- g_log(LOG_DOMAIN_CAPTURE, G_LOG_LEVEL_MESSAGE, "Capture Interface List ...");
-
- /* Try to get our interface list */
- *err = sync_interface_list_open(&msg);
- if (*err != 0) {
- g_log(LOG_DOMAIN_CAPTURE, G_LOG_LEVEL_MESSAGE, "Capture Interface List failed!");
- if (err_str) {
- *err_str = msg;
- } else {
- g_free(msg);
- }
- return NULL;
- }
-
- /* Split our lines */
-#ifdef _WIN32
- raw_list = g_strsplit(msg, "\r\n", 0);
-#else
- raw_list = g_strsplit(msg, "\n", 0);
-#endif
- g_free(msg);
-
- for (i = 0; raw_list[i] != NULL; i++) {
- if_parts = g_strsplit(raw_list[i], "\t", 4);
- if (if_parts[0] == NULL || if_parts[1] == NULL || if_parts[2] == NULL ||
- if_parts[3] == NULL) {
- g_strfreev(if_parts);
- continue;
- }
-
- /* Number followed by the name, e.g "1. eth0" */
- name = strchr(if_parts[0], ' ');
- if (name) {
- name++;
- } else {
- g_strfreev(if_parts);
- continue;
- }
-
- if_info = g_malloc0(sizeof(if_info_t));
- if_info->name = g_strdup(name);
- if (strlen(if_parts[1]) > 0)
- if_info->description = g_strdup(if_parts[1]);
- addr_parts = g_strsplit(if_parts[2], ",", 0);
- for (j = 0; addr_parts[j] != NULL; j++) {
- if_addr = g_malloc0(sizeof(if_addr_t));
- if (inet_pton(AF_INET, addr_parts[j], &if_addr->ip_addr.ip4_addr)) {
- if_addr->type = AT_IPv4;
- } else if (inet_pton(AF_INET6, addr_parts[j],
- &if_addr->ip_addr.ip6_addr)) {
- if_addr->type = AT_IPv6;
- } else {
- g_free(if_addr);
- if_addr = NULL;
- }
- if (if_addr) {
- if_info->ip_addr = g_slist_append(if_info->ip_addr, if_addr);
- }
- }
- if (strcmp(if_parts[3], "loopback") == 0)
- if_info->loopback = TRUE;
- g_strfreev(if_parts);
- g_strfreev(addr_parts);
- if_list = g_list_append(if_list, if_info);
- }
- g_strfreev(raw_list);
-
- /* Check to see if we built a list */
- if (if_list == NULL) {
- *err = NO_INTERFACES_FOUND;
- if (err_str)
- *err_str = g_strdup("No interfaces found");
- }
- return if_list;
-}
-
-/* XXX - We parse simple text output to get our interface list. Should
- * we use "real" data serialization instead, e.g. via XML? */
-GList *
-capture_pcap_linktype_list(const gchar *ifname, char **err_str)
-{
- GList *linktype_list = NULL;
- int err, i;
- gchar *msg;
- gchar **raw_list, **lt_parts;
- data_link_info_t *data_link_info;
-
- g_log(LOG_DOMAIN_CAPTURE, G_LOG_LEVEL_MESSAGE, "Capture Interface List ...");
-
- /* Try to get our interface list */
- err = sync_linktype_list_open(ifname, &msg);
- if (err != 0) {
- g_log(LOG_DOMAIN_CAPTURE, G_LOG_LEVEL_MESSAGE, "Capture Interface List failed!");
- if (err_str) {
- *err_str = msg;
- } else {
- g_free(msg);
- }
- return NULL;
- }
-
- /* Split our lines */
-#ifdef _WIN32
- raw_list = g_strsplit(msg, "\r\n", 0);
-#else
- raw_list = g_strsplit(msg, "\n", 0);
-#endif
- g_free(msg);
-
- for (i = 0; raw_list[i] != NULL; i++) {
- /* ...and what if the interface name has a tab in it, Mr. Clever Programmer? */
- lt_parts = g_strsplit(raw_list[i], "\t", 3);
- if (lt_parts[0] == NULL || lt_parts[1] == NULL || lt_parts[2] == NULL) {
- g_strfreev(lt_parts);
- continue;
- }
-
- data_link_info = g_malloc(sizeof (data_link_info_t));
- data_link_info->dlt = (int) strtol(lt_parts[0], NULL, 10);
- data_link_info->name = g_strdup(lt_parts[1]);
- if (strcmp(lt_parts[2], "(not supported)") != 0)
- data_link_info->description = g_strdup(lt_parts[2]);
- else
- data_link_info->description = NULL;
-
- linktype_list = g_list_append(linktype_list, data_link_info);
- }
- g_strfreev(raw_list);
-
- /* Check to see if we built a list */
- if (linktype_list == NULL) {
- if (err_str)
- *err_str = NULL;
- }
- return linktype_list;
-}
-
if_stat_cache_t *
capture_stat_start(GList *if_list) {
int stat_fd, fork_child;
capture_stat_stop(if_stat_cache_t *sc) {
GList *sc_entry;
if_stat_cache_item_t *sc_item;
+ int ret;
gchar *msg;
if (!sc)
return;
- sync_interface_stats_close(&sc->stat_fd, &sc->fork_child, &msg);
+ ret = sync_interface_stats_close(&sc->stat_fd, &sc->fork_child, &msg);
+ if (ret == -1) {
+ /* XXX - report failure? */
+ g_free(msg);
+ }
for (sc_entry = sc->cache_list; sc_entry != NULL; sc_entry = g_list_next(sc_entry)) {
sc_item = sc_entry->data;
git.samba.org / metze / wireshark / wip.git / blobdiff