#include <glib.h>
#include <epan/packet.h>
+#include <epan/prefs.h>
+#include "ui/simple_dialog.h"
+#include "capture_ui_utils.h"
#include "capture_opts.h"
#include "ringbuffer.h"
{
capture_opts->cf = cf;
capture_opts->ifaces = g_array_new(FALSE, FALSE, sizeof(interface_options));
+ capture_opts->all_ifaces = g_array_new(FALSE, FALSE, sizeof(interface_t));
+ capture_opts->num_selected = 0;
capture_opts->default_options.name = NULL;
capture_opts->default_options.descr = NULL;
capture_opts->default_options.cfilter = NULL;
#endif
capture_opts->real_time_mode = TRUE;
capture_opts->show_info = TRUE;
- capture_opts->quit_after_cap = FALSE;
+ capture_opts->quit_after_cap = getenv("WIRESHARK_QUIT_AFTER_CAPTURE") ? TRUE : FALSE;
capture_opts->restart = FALSE;
capture_opts->multi_files_on = FALSE;
}
#endif
-static int
+int
capture_opts_add_iface_opt(capture_options *capture_opts, const char *optarg_str_p)
{
long adapter_index;
int err;
gchar *err_str;
interface_options interface_opts;
- gboolean found = FALSE;
/*
* names that begin with digits. It can be useful on Windows, where
* more than one interface can have the same name.
*/
- if_list = capture_interface_list(&err, &err_str);
- if (if_list == NULL) {
- switch (err) {
-
- case CANT_GET_INTERFACE_LIST:
- cmdarg_err("%s", err_str);
- g_free(err_str);
- break;
-
- case NO_INTERFACES_FOUND:
- cmdarg_err("There are no interfaces on which a capture can be done");
- break;
- }
- return 2;
- }
adapter_index = strtol(optarg_str_p, &p, 10);
if (p != NULL && *p == '\0') {
if (adapter_index < 0) {
cmdarg_err("There is no interface with that adapter index");
return 1;
}
+ if_list = capture_interface_list(&err, &err_str);
+ if (if_list == NULL) {
+ switch (err) {
+
+ case CANT_GET_INTERFACE_LIST:
+ case DONT_HAVE_PCAP:
+ cmdarg_err("%s", err_str);
+ g_free(err_str);
+ break;
+ case NO_INTERFACES_FOUND:
+ cmdarg_err("There are no interfaces on which a capture can be done");
+ break;
+ }
+ return 2;
+ }
if_info = (if_info_t *)g_list_nth_data(if_list, adapter_index - 1);
if (if_info == NULL) {
cmdarg_err("There is no interface with that adapter index");
return 1;
}
- found = TRUE;
interface_opts.name = g_strdup(if_info->name);
/* We don't set iface_descr here because doing so requires
* capture_ui_utils.c which requires epan/prefs.c which is
* probably a bit too much dependency for here...
*/
+ free_interface_list(if_list);
} else {
- GList *curr;
-
- for (curr = g_list_first(if_list); curr; curr = g_list_next(curr)) {
- if_info = curr->data;
- if (strcmp(if_info->name, optarg_str_p) == 0) {
- found = TRUE;
- break;
- }
- }
- if (found) {
- interface_opts.name = g_strdup(optarg_str_p);
- }
+ interface_opts.name = g_strdup(optarg_str_p);
}
- free_interface_list(if_list);
- if (found) {
- interface_opts.descr = g_strdup(capture_opts->default_options.descr);
- interface_opts.cfilter = g_strdup(capture_opts->default_options.cfilter);
- interface_opts.snaplen = capture_opts->default_options.snaplen;
- interface_opts.has_snaplen = capture_opts->default_options.has_snaplen;
- interface_opts.linktype = capture_opts->default_options.linktype;
- interface_opts.promisc_mode = capture_opts->default_options.promisc_mode;
+ interface_opts.descr = g_strdup(capture_opts->default_options.descr);
+ interface_opts.cfilter = g_strdup(capture_opts->default_options.cfilter);
+ interface_opts.snaplen = capture_opts->default_options.snaplen;
+ interface_opts.has_snaplen = capture_opts->default_options.has_snaplen;
+ interface_opts.linktype = capture_opts->default_options.linktype;
+ interface_opts.promisc_mode = capture_opts->default_options.promisc_mode;
#if defined(_WIN32) || defined(HAVE_PCAP_CREATE)
- interface_opts.buffer_size = capture_opts->default_options.buffer_size;
+ interface_opts.buffer_size = capture_opts->default_options.buffer_size;
#endif
- interface_opts.monitor_mode = capture_opts->default_options.monitor_mode;
+ interface_opts.monitor_mode = capture_opts->default_options.monitor_mode;
#ifdef HAVE_PCAP_REMOTE
- interface_opts.src_type = capture_opts->default_options.src_type;
- interface_opts.remote_host = g_strdup(capture_opts->default_options.remote_host);
- interface_opts.remote_port = g_strdup(capture_opts->default_options.remote_port);
- interface_opts.auth_type = capture_opts->default_options.auth_type;
- interface_opts.auth_username = g_strdup(capture_opts->default_options.auth_username);
- interface_opts.auth_password = g_strdup(capture_opts->default_options.auth_password);
- interface_opts.datatx_udp = capture_opts->default_options.datatx_udp;
- interface_opts.nocap_rpcap = capture_opts->default_options.nocap_rpcap;
- interface_opts.nocap_local = capture_opts->default_options.nocap_local;
+ interface_opts.src_type = capture_opts->default_options.src_type;
+ interface_opts.remote_host = g_strdup(capture_opts->default_options.remote_host);
+ interface_opts.remote_port = g_strdup(capture_opts->default_options.remote_port);
+ interface_opts.auth_type = capture_opts->default_options.auth_type;
+ interface_opts.auth_username = g_strdup(capture_opts->default_options.auth_username);
+ interface_opts.auth_password = g_strdup(capture_opts->default_options.auth_password);
+ interface_opts.datatx_udp = capture_opts->default_options.datatx_udp;
+ interface_opts.nocap_rpcap = capture_opts->default_options.nocap_rpcap;
+ interface_opts.nocap_local = capture_opts->default_options.nocap_local;
#endif
#ifdef HAVE_PCAP_SETSAMPLING
- interface_opts.sampling_method = capture_opts->default_options.sampling_method;
- interface_opts.sampling_param = capture_opts->default_options.sampling_param;
+ interface_opts.sampling_method = capture_opts->default_options.sampling_method;
+ interface_opts.sampling_param = capture_opts->default_options.sampling_param;
#endif
- g_array_append_val(capture_opts->ifaces, interface_opts);
- } else {
- cmdarg_err("There is no interface with that name (%s)", optarg_str_p);
- return 1;
- }
-
+ g_array_append_val(capture_opts->ifaces, interface_opts);
+
return 0;
}
+
int
capture_opts_add_opt(capture_options *capture_opts, int opt, const char *optarg_str_p, gboolean *start_capture)
{
case 'P': /* Use pcap format */
capture_opts->use_pcapng = FALSE;
break;
- case 'Q': /* Quit after capture (just capture to file) */
- capture_opts->quit_after_cap = TRUE;
- *start_capture = TRUE; /*** -Q implies -k !! ***/
- break;
#ifdef HAVE_PCAP_REMOTE
case 'r':
if (capture_opts->ifaces->len > 0) {
/* Did the user specify an interface to use? */
- if (capture_opts->ifaces->len == 0) {
+ if (capture_opts->num_selected == 0 && capture_opts->ifaces->len == 0) {
/* No - is a default specified in the preferences file? */
if (capture_device != NULL) {
/* Yes - use it. */
switch (err) {
case CANT_GET_INTERFACE_LIST:
+ case DONT_HAVE_PCAP:
cmdarg_err("%s", err_str);
g_free(err_str);
break;
return 0;
}
+void
+collect_ifaces(capture_options *capture_opts)
+{
+ guint i;
+ interface_t device;
+ interface_options interface_opts;
+ for (i = 0; i < capture_opts->all_ifaces->len; i++) {
+ device = g_array_index(capture_opts->all_ifaces, interface_t, i);
+ if (!device.hidden && device.selected) {
+ interface_opts.name = g_strdup(device.name);
+ interface_opts.descr = g_strdup(device.display_name);
+ interface_opts.linktype = device.active_dlt;
+ interface_opts.cfilter = g_strdup(device.cfilter);
+ interface_opts.snaplen = device.snaplen;
+ interface_opts.has_snaplen = device.has_snaplen;
+ interface_opts.promisc_mode = device.pmode;
+#if defined(_WIN32) || defined(HAVE_PCAP_CREATE)
+ interface_opts.buffer_size = device.buffer;
+#endif
+#ifdef HAVE_PCAP_CREATE
+ interface_opts.monitor_mode = device.monitor_mode_enabled;
+#endif
+ if (!device.local) {
+#ifdef HAVE_PCAP_REMOTE
+ interface_opts.src_type = CAPTURE_IFREMOTE;
+ interface_opts.remote_host = g_strdup(device.remote_opts.remote_host_opts.remote_host);
+ interface_opts.remote_port = g_strdup(device.remote_opts.remote_host_opts.remote_port);
+ interface_opts.auth_type = device.remote_opts.remote_host_opts.auth_type;
+ interface_opts.auth_username = g_strdup(device.remote_opts.remote_host_opts.auth_username);
+ interface_opts.auth_password = g_strdup(device.remote_opts.remote_host_opts.auth_password);
+ interface_opts.datatx_udp = device.remote_opts.remote_host_opts.datatx_udp;
+ interface_opts.nocap_rpcap = device.remote_opts.remote_host_opts.nocap_rpcap;
+ interface_opts.nocap_local = device.remote_opts.remote_host_opts.nocap_local;
+#endif
+#ifdef HAVE_PCAP_SETSAMPLING
+ interface_opts.sampling_method = device.remote_opts.sampling_method;
+ interface_opts.sampling_param = device.remote_opts.sampling_param;
+#endif
+ }
+ g_array_append_val(capture_opts->ifaces, interface_opts);
+ } else {
+ continue;
+ }
+ }
+}
+
+
#endif /* HAVE_LIBPCAP */
git.samba.org / obnox / wireshark / wip.git / blobdiff