#include <unistd.h>
#endif
+#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include <ctype.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>
#include "capture-wpcap.h"
#endif
#include "ui_util.h"
-#include "file_util.h"
+#include "wsutil/file_util.h"
#include "log.h"
typedef struct if_stat_cache_item_s {
GList *cache_list; /* List of if_stat_chache_entry_t */
};
+/* this callback mechanism should possibly be replaced by the g_signal_...() stuff (if I only would know how :-) */
+typedef struct {
+ capture_callback_t cb_fct;
+ gpointer user_data;
+} capture_callback_data_t;
+
+static GList *capture_callbacks = NULL;
+
+static void
+capture_callback_invoke(int event, capture_options *capture_opts)
+{
+ capture_callback_data_t *cb;
+ GList *cb_item = capture_callbacks;
+
+ /* there should be at least one interested */
+ g_assert(cb_item != NULL);
+
+ while(cb_item != NULL) {
+ cb = cb_item->data;
+ cb->cb_fct(event, capture_opts, cb->user_data);
+ cb_item = g_list_next(cb_item);
+ }
+}
+
+
+void
+capture_callback_add(capture_callback_t func, gpointer user_data)
+{
+ capture_callback_data_t *cb;
+
+ cb = g_malloc(sizeof(capture_callback_data_t));
+ cb->cb_fct = func;
+ cb->user_data = user_data;
+
+ capture_callbacks = g_list_append(capture_callbacks, cb);
+}
+
+void
+capture_callback_remove(capture_callback_t func)
+{
+ capture_callback_data_t *cb;
+ GList *cb_item = capture_callbacks;
+
+ while(cb_item != NULL) {
+ cb = cb_item->data;
+ if(cb->cb_fct == func) {
+ capture_callbacks = g_list_remove(capture_callbacks, cb);
+ g_free(cb);
+ return;
+ }
+ cb_item = g_list_next(cb_item);
+ }
+
+ g_assert_not_reached();
+}
+
/**
* Start a capture.
*
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 */
- cf_callback_invoke(cf_cb_live_capture_prepared, capture_opts);
+ /* 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)
- capture_info_open(capture_opts->iface);
+ capture_info_open(capture_opts);
}
return ret;
{
g_log(LOG_DOMAIN_CAPTURE, G_LOG_LEVEL_MESSAGE, "Capture Stop ...");
- cf_callback_invoke(cf_cb_live_capture_stopping, capture_opts);
+ capture_callback_invoke(capture_cb_capture_stopping, capture_opts);
/* stop the capture child gracefully */
sync_pipe_stop(capture_opts);
-/* 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)
/* 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.
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"
/* 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) {
- cf_callback_invoke(cf_cb_live_capture_update_finished, capture_opts->cf);
+ capture_callback_invoke(capture_cb_capture_update_finished, capture_opts);
cf_finish_tail(capture_opts->cf, &err);
cf_close(capture_opts->cf);
}
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);
}
}
if(capture_opts->real_time_mode) {
- cf_callback_invoke(cf_cb_live_capture_update_started, capture_opts);
+ capture_callback_invoke(capture_cb_capture_update_started, capture_opts);
} else {
- cf_callback_invoke(cf_cb_live_capture_fixed_started, capture_opts);
+ capture_callback_invoke(capture_cb_capture_fixed_started, capture_opts);
}
capture_opts->state = CAPTURE_RUNNING;
file.
XXX - abort on a read error? */
- cf_callback_invoke(cf_cb_live_capture_update_continue, capture_opts->cf);
+ capture_callback_invoke(capture_cb_capture_update_continue, capture_opts);
break;
case CF_READ_ABORTED:
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_callback_invoke(cf_cb_live_capture_fixed_continue, 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 told us how many dropped packets it counted.
*/
void
-capture_input_drops(capture_options *capture_opts, int dropped)
+capture_input_drops(capture_options *capture_opts, guint32 dropped)
{
- g_log(LOG_DOMAIN_CAPTURE, G_LOG_LEVEL_INFO, "%d packet%s dropped", dropped, plurality(dropped, "", "s"));
+ g_log(LOG_DOMAIN_CAPTURE, G_LOG_LEVEL_INFO, "%u packet%s dropped", dropped, plurality(dropped, "", "s"));
g_assert(capture_opts->state == CAPTURE_RUNNING);
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 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) {
- cf_callback_invoke(cf_cb_live_capture_update_started, capture_opts);
+ capture_callback_invoke(capture_cb_capture_update_started, capture_opts);
} else {
- cf_callback_invoke(cf_cb_live_capture_fixed_started, capture_opts);
+ capture_callback_invoke(capture_cb_capture_fixed_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. */
- cf_callback_invoke(cf_cb_live_capture_update_finished, 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
+ correctly displayed */
+ capture_callback_invoke(capture_cb_capture_update_finished, capture_opts);
/* Finish the capture. */
switch (status) {
} else {
/* first of all, we are not doing a capture any more */
- cf_callback_invoke(cf_cb_live_capture_fixed_finished, capture_opts->cf);
+ capture_callback_invoke(capture_cb_capture_fixed_finished, capture_opts);
/* this is a normal mode capture and if no error happened, read in the capture file data */
if(capture_opts->save_file != NULL) {
if(capture_opts->restart) {
capture_opts->restart = FALSE;
- eth_unlink(capture_opts->save_file);
+ ws_unlink(capture_opts->save_file);
/* if it was a tempfile, throw away the old filename (so it will become a tempfile again) */
if(cf_is_tempfile(capture_opts->cf)) {
/**
* Fetch the interface list from a child process (dumpcap).
*
- * @return A GList containing if_info_t structs if successful, NULL otherwise.
+ * @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
if (*err != 0) {
g_log(LOG_DOMAIN_CAPTURE, G_LOG_LEVEL_MESSAGE, "Capture Interface List failed!");
if (err_str) {
- if (*err_str)
- *err_str = msg;
- else
- g_free(msg);
+ *err_str = msg;
} else {
g_free(msg);
}
}
/* 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++) {
/* Check to see if we built a list */
if (if_list == NULL) {
- if (err_str && *err_str)
- *err_str = g_strdup("No interfaces found");
*err = NO_INTERFACES_FOUND;
+ if (err_str)
+ *err_str = g_strdup("No interfaces found");
}
return if_list;
}
}
/* 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++) {
git.samba.org / obnox / wireshark / wip.git / blobdiff