#endif
#include <string.h>
-#if 0
-/*
- * main_menu.h uses FILE, but I guess <stdio.h> is included by
- * something else before main_menu.h is included.
- */
+
#include <stdio.h>
-#endif
#include <gtk/gtk.h>
#include "../ringbuffer.h"
#include "gtk/main.h"
-#include "gtk/main_menu.h"
+#include "gtk/menus.h"
#include "gtk/gui_utils.h"
#include "gtk/capture_dlg.h"
#include "gtk/filter_dlg.h"
#endif
/* Capture callback data keys */
-#define E_CAP_IFACE_KEY "cap_iface"
-#define E_CAP_IFACE_IP_KEY "cap_iface_ip"
-#define E_CAP_SNAP_CB_KEY "cap_snap_cb"
-#define E_CAP_LT_OM_KEY "cap_lt_om"
-#define E_CAP_LT_OM_LABEL_KEY "cap_lt_om_label"
+#define E_CAP_IFACE_KEY "cap_iface"
+#define E_CAP_IFACE_IP_KEY "cap_iface_ip"
+#define E_CAP_SNAP_CB_KEY "cap_snap_cb"
+#define E_CAP_LT_OM_KEY "cap_lt_om"
+#define E_CAP_LT_OM_LABEL_KEY "cap_lt_om_label"
#ifdef _WIN32
-#define E_CAP_BUFFER_SIZE_SB_KEY "cap_buffer_size_sb"
+#define E_CAP_BUFFER_SIZE_SB_KEY "cap_buffer_size_sb"
#endif
-#define E_CAP_SNAP_SB_KEY "cap_snap_sb"
-#define E_CAP_PROMISC_KEY "cap_promisc"
-#define E_CAP_FILT_KEY "cap_filter_te"
-#define E_CAP_FILE_TE_KEY "cap_file_te"
-#define E_CAP_MULTI_FILES_ON_CB_KEY "cap_multi_files_on_cb"
-#define E_CAP_RING_FILESIZE_CB_KEY "cap_ring_filesize_cb"
-#define E_CAP_RING_FILESIZE_SB_KEY "cap_ring_filesize_sb"
-#define E_CAP_RING_FILESIZE_OM_KEY "cap_ring_filesize_om"
-#define E_CAP_FILE_DURATION_CB_KEY "cap_file_duration_cb"
-#define E_CAP_FILE_DURATION_SB_KEY "cap_file_duration_sb"
-#define E_CAP_FILE_DURATION_OM_KEY "cap_file_duration_om"
-#define E_CAP_RING_NBF_CB_KEY "cap_ring_nbf_cb"
-#define E_CAP_RING_NBF_SB_KEY "cap_ring_nbf_sb"
-#define E_CAP_RING_NBF_LB_KEY "cap_ring_nbf_lb"
-#define E_CAP_STOP_FILES_CB_KEY "cap_stop_files_cb"
-#define E_CAP_STOP_FILES_SB_KEY "cap_stop_files_sb"
-#define E_CAP_STOP_FILES_LB_KEY "cap_stop_files_lb"
-#define E_CAP_SYNC_KEY "cap_sync"
-#define E_CAP_AUTO_SCROLL_KEY "cap_auto_scroll"
-#define E_CAP_HIDE_INFO_KEY "cap_hide_info"
-#define E_CAP_STOP_PACKETS_CB_KEY "cap_stop_packets_cb"
-#define E_CAP_STOP_PACKETS_SB_KEY "cap_stop_packets_sb"
-#define E_CAP_STOP_PACKETS_LB_KEY "cap_stop_packets_lb"
-#define E_CAP_STOP_FILESIZE_CB_KEY "cap_stop_filesize_cb"
-#define E_CAP_STOP_FILESIZE_SB_KEY "cap_stop_filesize_sb"
-#define E_CAP_STOP_FILESIZE_OM_KEY "cap_stop_filesize_om"
-#define E_CAP_STOP_DURATION_CB_KEY "cap_stop_duration_cb"
-#define E_CAP_STOP_DURATION_SB_KEY "cap_stop_duration_sb"
-#define E_CAP_STOP_DURATION_OM_KEY "cap_stop_duration_om"
-#define E_CAP_M_RESOLVE_KEY "cap_m_resolve"
-#define E_CAP_N_RESOLVE_KEY "cap_n_resolve"
-#define E_CAP_T_RESOLVE_KEY "cap_t_resolve"
+#define E_CAP_SNAP_SB_KEY "cap_snap_sb"
+#define E_CAP_PROMISC_KEY "cap_promisc"
+#define E_CAP_PCAP_NG_KEY "cap_pcap_ng"
+#define E_CAP_FILT_KEY "cap_filter_te"
+#define E_CAP_FILE_TE_KEY "cap_file_te"
+#define E_CAP_MULTI_FILES_ON_CB_KEY "cap_multi_files_on_cb"
+#define E_CAP_RING_FILESIZE_CB_KEY "cap_ring_filesize_cb"
+#define E_CAP_RING_FILESIZE_SB_KEY "cap_ring_filesize_sb"
+#define E_CAP_RING_FILESIZE_CBX_KEY "cap_ring_filesize_cbx"
+#define E_CAP_FILE_DURATION_CB_KEY "cap_file_duration_cb"
+#define E_CAP_FILE_DURATION_SB_KEY "cap_file_duration_sb"
+#define E_CAP_FILE_DURATION_CBX_KEY "cap_file_duration_cbx"
+#define E_CAP_RING_NBF_CB_KEY "cap_ring_nbf_cb"
+#define E_CAP_RING_NBF_SB_KEY "cap_ring_nbf_sb"
+#define E_CAP_RING_NBF_LB_KEY "cap_ring_nbf_lb"
+#define E_CAP_STOP_FILES_CB_KEY "cap_stop_files_cb"
+#define E_CAP_STOP_FILES_SB_KEY "cap_stop_files_sb"
+#define E_CAP_STOP_FILES_LB_KEY "cap_stop_files_lb"
+#define E_CAP_SYNC_KEY "cap_sync"
+#define E_CAP_AUTO_SCROLL_KEY "cap_auto_scroll"
+#define E_CAP_HIDE_INFO_KEY "cap_hide_info"
+#define E_CAP_STOP_PACKETS_CB_KEY "cap_stop_packets_cb"
+#define E_CAP_STOP_PACKETS_SB_KEY "cap_stop_packets_sb"
+#define E_CAP_STOP_PACKETS_LB_KEY "cap_stop_packets_lb"
+#define E_CAP_STOP_FILESIZE_CB_KEY "cap_stop_filesize_cb"
+#define E_CAP_STOP_FILESIZE_SB_KEY "cap_stop_filesize_sb"
+#define E_CAP_STOP_FILESIZE_CBX_KEY "cap_stop_filesize_cbx"
+#define E_CAP_STOP_DURATION_CB_KEY "cap_stop_duration_cb"
+#define E_CAP_STOP_DURATION_SB_KEY "cap_stop_duration_sb"
+#define E_CAP_STOP_DURATION_CBX_KEY "cap_stop_duration_cbx"
+#define E_CAP_M_RESOLVE_KEY "cap_m_resolve"
+#define E_CAP_N_RESOLVE_KEY "cap_n_resolve"
+#define E_CAP_T_RESOLVE_KEY "cap_t_resolve"
#ifdef HAVE_PCAP_REMOTE
-#define E_CAP_IFTYPE_OM_KEY "cap_iftype_om"
-#define E_CAP_DATATX_UDP_CB_KEY "cap_datatx_udp_cb"
-#define E_CAP_NOCAP_RPCAP_CB_KEY "cap_nocap_rpcap_cb"
-#define E_CAP_REMOTE_DIALOG_PTR_KEY "cap_remote_dialog"
-#define E_CAP_REMOTE_CALLER_PTR_KEY "cap_remote_caller"
-#define E_REMOTE_HOST_TE_KEY "cap_remote_host"
-#define E_REMOTE_PORT_TE_KEY "cap_remote_port"
-#define E_REMOTE_AUTH_NULL_KEY "cap_remote_auth_null"
-#define E_REMOTE_AUTH_PASSWD_KEY "cap_remote_auth_passwd"
-#define E_REMOTE_USERNAME_LB_KEY "cap_remote_username_lb"
-#define E_REMOTE_USERNAME_TE_KEY "cap_remote_username_te"
-#define E_REMOTE_PASSWD_LB_KEY "cap_remote_passwd_lb"
-#define E_REMOTE_PASSWD_TE_KEY "cap_remote_passwd_te"
-#define E_CAP_OM_IFTYPE_VALUE_KEY "cap_om_iftype_value"
-#define E_OPT_REMOTE_BT_KEY "cap_remote_opt_bt"
-#define E_OPT_REMOTE_DIALOG_PTR_KEY "cap_remote_opt_dialog"
-#define E_OPT_REMOTE_CALLER_PTR_KEY "cap_remote_opt_caller"
+#define E_CAP_IFTYPE_CBX_KEY "cap_iftype_cbx"
+#define E_CAP_IF_LIST_KEY "cap_if_list"
+#define E_CAP_DATATX_UDP_CB_KEY "cap_datatx_udp_cb"
+#define E_CAP_NOCAP_RPCAP_CB_KEY "cap_nocap_rpcap_cb"
+#define E_CAP_REMOTE_DIALOG_PTR_KEY "cap_remote_dialog"
+#define E_CAP_REMOTE_CALLER_PTR_KEY "cap_remote_caller"
+#define E_REMOTE_HOST_TE_KEY "cap_remote_host"
+#define E_REMOTE_PORT_TE_KEY "cap_remote_port"
+#define E_REMOTE_AUTH_NULL_KEY "cap_remote_auth_null"
+#define E_REMOTE_AUTH_PASSWD_KEY "cap_remote_auth_passwd"
+#define E_REMOTE_USERNAME_LB_KEY "cap_remote_username_lb"
+#define E_REMOTE_USERNAME_TE_KEY "cap_remote_username_te"
+#define E_REMOTE_PASSWD_LB_KEY "cap_remote_passwd_lb"
+#define E_REMOTE_PASSWD_TE_KEY "cap_remote_passwd_te"
+#define E_CAP_CBX_IFTYPE_VALUE_KEY "cap_cbx_iftype_value"
+#define E_CAP_CBX_PREV_IFTYPE_VALUE_KEY "cap_cbx_prev_iftype_value"
+#define E_CAP_CBX_IFTYPE_NOUPDATE_KEY "cap_cbx_iftype_noupdate"
+#define E_OPT_REMOTE_BT_KEY "cap_remote_opt_bt"
+#define E_OPT_REMOTE_DIALOG_PTR_KEY "cap_remote_opt_dialog"
+#define E_OPT_REMOTE_CALLER_PTR_KEY "cap_remote_opt_caller"
#endif
#ifdef HAVE_PCAP_SETSAMPLING
-#define E_CAP_SAMP_NONE_RB_KEY "cap_samp_none_rb"
-#define E_CAP_SAMP_COUNT_RB_KEY "cap_samp_count_rb"
-#define E_CAP_SAMP_COUNT_SB_KEY "cap_samp_count_sb"
-#define E_CAP_SAMP_TIMER_RB_KEY "cap_samp_timer_rb"
-#define E_CAP_SAMP_TIMER_SB_KEY "cap_samp_timer_sb"
+#define E_CAP_SAMP_NONE_RB_KEY "cap_samp_none_rb"
+#define E_CAP_SAMP_COUNT_RB_KEY "cap_samp_count_rb"
+#define E_CAP_SAMP_COUNT_SB_KEY "cap_samp_count_sb"
+#define E_CAP_SAMP_TIMER_RB_KEY "cap_samp_timer_rb"
+#define E_CAP_SAMP_TIMER_SB_KEY "cap_samp_timer_sb"
#endif
-#define E_CAP_OM_LT_VALUE_KEY "cap_om_lt_value"
+#define E_CAP_OM_LT_VALUE_KEY "cap_om_lt_value"
/*
static GtkWidget * dl_hdr_menu=NULL;
static GHashTable *linktype_history=NULL;
+#ifdef HAVE_PCAP_REMOTE
+static GHashTable *remote_host_list=NULL;
+#endif
+
static void
capture_prep_file_cb(GtkWidget *file_bt, GtkWidget *file_te);
#ifdef HAVE_PCAP_REMOTE
static void
-select_if_type_cb(GtkWidget *w, gpointer data);
+select_if_type_cb(GtkComboBox *iftype_cbx, gpointer data);
static void
-capture_remote_cb(GtkWidget *w, gpointer data);
+capture_remote_cb(GtkWidget *w, gboolean focus_username);
#endif
+static void
+capture_cancel_cb(GtkWidget *win, gpointer data);
+
static void
capture_prep_adjust_sensitivity(GtkWidget *tb, gpointer parent_w);
capture_restart(&global_capture_opts);
}
+gint
+capture_get_linktype (gchar *if_name)
+{
+ gint linktype, *linktype_p;
+
+ if (linktype_history) {
+ linktype_p = g_hash_table_lookup(linktype_history, if_name);
+ } else {
+ linktype_p = NULL;
+ }
+
+ if (linktype_p) {
+ linktype = *linktype_p;
+ } else {
+ linktype = capture_dev_user_linktype_find(if_name);
+ }
+
+ return linktype;
+}
+
/* init the link type list */
/* (often this list has only one entry and will therefore be disabled) */
static void
GtkWidget *lt_menu, *lt_menu_item;
GList *lt_entry;
gint linktype, linktype_select, linktype_count;
- gint *linktype_p;
data_link_info_t *data_link_info;
gchar *linktype_menu_label;
guint num_supported_link_types;
int ips = 0;
GSList *curr_ip;
if_addr_t *ip_addr;
+#ifdef HAVE_PCAP_REMOTE
+ GtkWidget *iftype_cbx;
+ int iftype;
+#endif
#ifdef HAVE_AIRPCAP
GtkWidget *advanced_bt;
#endif
entry_text = g_strdup(gtk_entry_get_text(GTK_ENTRY(entry)));
if_text = g_strstrip(entry_text);
if_name = g_strdup(get_if_name(if_text));
-
- linktype_p = g_hash_table_lookup (linktype_history, if_name);
- if (linktype_p) {
- linktype = *linktype_p;
- } else {
- linktype = capture_dev_user_linktype_find(if_name);
- }
+ linktype = capture_get_linktype(if_name);
#ifdef HAVE_AIRPCAP
/* is it an airpcap interface??? */
* Try to get the list of known interfaces.
*/
#ifdef HAVE_PCAP_REMOTE
- if (global_capture_opts.src_type == CAPTURE_IFREMOTE)
- /* Not able to get link-layer for remote interfaces */
- if_list = NULL;
+ iftype_cbx = g_object_get_data(G_OBJECT(cap_open_w), E_CAP_IFTYPE_CBX_KEY);
+ iftype = GPOINTER_TO_INT(g_object_get_data(G_OBJECT(iftype_cbx),
+ E_CAP_CBX_IFTYPE_VALUE_KEY));
+ if (iftype >= CAPTURE_IFREMOTE)
+ if_list = (GList *) g_object_get_data(G_OBJECT(cap_open_w), E_CAP_IF_LIST_KEY);
else
if_list = capture_interface_list(&err, NULL);
#else
* It's in the list.
* Get the list of link-layer types for it.
*/
+#ifdef HAVE_PCAP_REMOTE
+ if (iftype == CAPTURE_IFLOCAL)
+ /* Not able to get link-layer for remote interfaces */
+#endif
lt_list = capture_pcap_linktype_list(if_name, NULL);
/* create string of list of IP addresses of this interface */
g_string_append(ip_str, " (loopback)");
}
}
+#ifdef HAVE_PCAP_REMOTE
+ /* Only delete if fetched local */
+ if (iftype == CAPTURE_IFLOCAL)
+#endif
free_interface_list(if_list);
}
}
/* create one of the duration options */
/* (and select the matching unit depending on the given value) */
-static GtkWidget *time_unit_option_menu_new(guint32 value) {
- GtkWidget *unit_om, *menu, *menu_item;
+static GtkWidget *time_unit_combo_box_new(guint32 value) {
+ GtkWidget *unit_combo_box;
int i;
- unit_om=gtk_option_menu_new();
- menu=gtk_menu_new();
+ unit_combo_box = gtk_combo_box_new_text ();
for(i=0;i<MAX_TIME_UNITS;i++){
- menu_item=gtk_menu_item_new_with_label(time_unit_name[i]);
- g_object_set_data(G_OBJECT(menu_item), "time_unit", GINT_TO_POINTER(i));
- gtk_menu_shell_append(GTK_MENU_SHELL(menu), menu_item);
+ gtk_combo_box_append_text (GTK_COMBO_BOX (unit_combo_box), time_unit_name[i]);
}
-
- /* the selected menu item can't be changed, once the option_menu
- is created, so set the matching menu item now */
+ /* the selected combo_box item can't be changed, once the combo_box
+ is created, so set the matching combo_box item now */
/* days */
if(value >= 60 * 60 * 24) {
- gtk_menu_set_active(GTK_MENU(menu), TIME_UNIT_DAY);
+ gtk_combo_box_set_active(GTK_COMBO_BOX(unit_combo_box), TIME_UNIT_DAY);
} else {
/* hours */
if(value >= 60 * 60) {
- gtk_menu_set_active(GTK_MENU(menu), TIME_UNIT_HOUR);
+ gtk_combo_box_set_active(GTK_COMBO_BOX(unit_combo_box), TIME_UNIT_HOUR);
} else {
/* minutes */
if(value >= 60) {
- gtk_menu_set_active(GTK_MENU(menu), TIME_UNIT_MINUTE);
+ gtk_combo_box_set_active(GTK_COMBO_BOX(unit_combo_box), TIME_UNIT_MINUTE);
} else {
/* seconds */
- gtk_menu_set_active(GTK_MENU(menu), TIME_UNIT_SECOND);
+ gtk_combo_box_set_active(GTK_COMBO_BOX(unit_combo_box), TIME_UNIT_SECOND);
}
}
}
- gtk_option_menu_set_menu(GTK_OPTION_MENU(unit_om), menu);
-
- return unit_om;
+ return unit_combo_box;
}
/* convert time value from raw to displayed (e.g. 60s -> 1min) */
-static guint32 time_unit_option_menu_convert_value(
+static guint32 time_unit_combo_box_convert_value(
guint32 value)
{
/* days */
}
/* get raw value from unit and value fields */
-static guint32 time_unit_option_menu_get_value(
-GtkWidget *unit_om,
+static guint32 time_unit_combo_box_get_value(
+GtkWidget *unit_combo_box,
guint32 value)
{
- GtkWidget *menu, *menu_item;
int unit;
- menu = gtk_option_menu_get_menu(GTK_OPTION_MENU(unit_om));
- menu_item = gtk_menu_get_active(GTK_MENU(menu));
- unit = GPOINTER_TO_INT(g_object_get_data(G_OBJECT(menu_item), "time_unit"));
-
+ unit = gtk_combo_box_get_active (GTK_COMBO_BOX(unit_combo_box));
switch(unit) {
case(TIME_UNIT_SECOND):
/* create one of the size options */
/* (and select the matching unit depending on the given value) */
-static GtkWidget *size_unit_option_menu_new(guint32 value) {
- GtkWidget *unit_om, *menu, *menu_item;
+static GtkWidget *size_unit_combo_box_new(guint32 value) {
+ GtkWidget *unit_combo_box;
int i;
- unit_om=gtk_option_menu_new();
- menu=gtk_menu_new();
+ unit_combo_box=gtk_combo_box_new_text();
for(i=0;i<MAX_SIZE_UNITS;i++){
- menu_item=gtk_menu_item_new_with_label(size_unit_name[i]);
- g_object_set_data(G_OBJECT(menu_item), "size_unit", GINT_TO_POINTER(i));
- gtk_menu_shell_append(GTK_MENU_SHELL(menu), menu_item);
+ gtk_combo_box_append_text (GTK_COMBO_BOX (unit_combo_box), size_unit_name[i]);
}
- /* the selected menu item can't be changed, once the option_menu
- is created, so set the matching menu item now */
+ /* the selected combo_box item can't be changed, once the combo_box
+ is created, so set the matching combo_box item now */
/* gigabytes */
if(value >= 1024 * 1024) {
- gtk_menu_set_active(GTK_MENU(menu), SIZE_UNIT_GIGABYTES);
+ gtk_combo_box_set_active(GTK_COMBO_BOX(unit_combo_box), SIZE_UNIT_GIGABYTES);
} else {
/* megabytes */
if(value >= 1024) {
- gtk_menu_set_active(GTK_MENU(menu), SIZE_UNIT_MEGABYTES);
+ gtk_combo_box_set_active(GTK_COMBO_BOX(unit_combo_box), SIZE_UNIT_MEGABYTES);
} else {
/* kilobytes */
- gtk_menu_set_active(GTK_MENU(menu), SIZE_UNIT_KILOBYTES);
+ gtk_combo_box_set_active(GTK_COMBO_BOX(unit_combo_box), SIZE_UNIT_KILOBYTES);
}
}
- gtk_option_menu_set_menu(GTK_OPTION_MENU(unit_om), menu);
-
- return unit_om;
+ return unit_combo_box;
}
/* convert size value from raw to displayed (e.g. 1024 Bytes -> 1 KB) */
-static guint32 size_unit_option_menu_set_value(
+static guint32 size_unit_combo_box_set_value(
guint32 value)
{
/* gigabytes */
}
/* get raw value from unit and value fields */
-static guint32 size_unit_option_menu_convert_value(
-GtkWidget *unit_om,
+static guint32 size_unit_combo_box_convert_value(
+GtkWidget *unit_combo_box,
guint32 value)
{
- GtkWidget *menu, *menu_item;
int unit;
- menu = gtk_option_menu_get_menu(GTK_OPTION_MENU(unit_om));
- menu_item = gtk_menu_get_active(GTK_MENU(menu));
- unit = GPOINTER_TO_INT(g_object_get_data(G_OBJECT(menu_item), "size_unit"));
-
+ unit = gtk_combo_box_get_active (GTK_COMBO_BOX(unit_combo_box));
switch(unit) {
case(SIZE_UNIT_KILOBYTES):
void
options_airpcap_advanced_cb(GtkWidget *w _U_, gpointer d _U_)
{
-int *from_widget;
+ int *from_widget;
-from_widget = (gint*)g_malloc(sizeof(gint));
-*from_widget = AIRPCAP_ADVANCED_FROM_OPTIONS;
-g_object_set_data(G_OBJECT(airpcap_tb),AIRPCAP_ADVANCED_FROM_KEY,from_widget);
+ from_widget = (gint*)g_malloc(sizeof(gint));
+ *from_widget = AIRPCAP_ADVANCED_FROM_OPTIONS;
+ g_object_set_data(G_OBJECT(airpcap_tb),AIRPCAP_ADVANCED_FROM_KEY,from_widget);
-airpcap_if_active = airpcap_if_selected;
-airpcap_enable_toolbar_widgets(airpcap_tb,FALSE);
-display_airpcap_advanced_cb(w,d);
+ airpcap_if_active = airpcap_if_selected;
+ airpcap_enable_toolbar_widgets(airpcap_tb,FALSE);
+ display_airpcap_advanced_cb(w,d);
}
#endif
/* List of available types of PCAP interface */
static struct iftype_info iftype[] = {
{ CAPTURE_IFLOCAL, "Local" },
- { CAPTURE_IFREMOTE, "Remote" }
+ { CAPTURE_IFREMOTE, "Remote..." }
};
+#if GTK_CHECK_VERSION(2,6,0)
+#define REMOTE_HOST_START ((sizeof(iftype) / sizeof(iftype[0])) + 1)
+#define REMOTE_HOST_SEPARATOR "---"
+#else
+#define REMOTE_HOST_START ((sizeof(iftype) / sizeof(iftype[0])))
+#endif
+
+static void
+iftype_combo_box_add_remote_separators (GtkWidget *iftype_cbx)
+{
+#if GTK_CHECK_VERSION(2,6,0)
+ gtk_combo_box_append_text(GTK_COMBO_BOX(iftype_cbx), REMOTE_HOST_SEPARATOR);
+ gtk_combo_box_append_text(GTK_COMBO_BOX(iftype_cbx), REMOTE_HOST_SEPARATOR);
+#endif
+ gtk_combo_box_append_text(GTK_COMBO_BOX(iftype_cbx), "Clear list");
+}
+
+static void
+iftype_combo_box_add (GtkWidget *iftype_cbx)
+{
+ GtkTreeModel *model;
+ GtkTreeIter iter;
+ struct remote_host *rh;
+ gboolean create_new = FALSE;
+ gchar *string;
+ guint i, pos = REMOTE_HOST_START;
+
+ rh = g_hash_table_lookup (remote_host_list, global_capture_opts.remote_host);
+ if (!rh) {
+ rh = g_malloc0 (sizeof (*rh));
+ if (g_hash_table_size (remote_host_list) == 0) {
+ iftype_combo_box_add_remote_separators (iftype_cbx);
+ }
+ gtk_combo_box_insert_text(GTK_COMBO_BOX(iftype_cbx), pos, global_capture_opts.remote_host);
+ rh->remote_host = g_strdup (global_capture_opts.remote_host);
+ create_new = TRUE;
+ } else {
+ model = gtk_combo_box_get_model(GTK_COMBO_BOX(iftype_cbx));
+ if (gtk_tree_model_get_iter_first(model, &iter)) {
+ /* Skip the first entries */
+ for (i = 0; i < REMOTE_HOST_START; i++)
+ gtk_tree_model_iter_next(model, &iter);
+ do {
+ gtk_tree_model_get(model, &iter, 0, &string, -1);
+ if (string) {
+ if (strcmp (global_capture_opts.remote_host, string) == 0) {
+ /* Found match, show this position in combo box */
+ g_free (string);
+ break;
+ }
+ g_free (string);
+ }
+ pos++;
+ } while (gtk_tree_model_iter_next(model, &iter));
+ }
+
+ g_free (rh->remote_port);
+ g_free (rh->auth_username);
+ g_free (rh->auth_password);
+ }
+
+ rh->remote_port = g_strdup (global_capture_opts.remote_port);
+ rh->auth_type = global_capture_opts.auth_type;
+ rh->auth_username = g_strdup (global_capture_opts.auth_username);
+ rh->auth_password = g_strdup (global_capture_opts.auth_password);
+
+ if (create_new) {
+ g_hash_table_insert (remote_host_list, g_strdup (global_capture_opts.remote_host), rh);
+ }
+
+ g_object_set_data(G_OBJECT(iftype_cbx), E_CAP_CBX_IFTYPE_VALUE_KEY, GINT_TO_POINTER(pos));
+ g_object_set_data(G_OBJECT(iftype_cbx), E_CAP_CBX_IFTYPE_NOUPDATE_KEY, GINT_TO_POINTER(1));
+ gtk_combo_box_set_active(GTK_COMBO_BOX(iftype_cbx), pos);
+ g_object_set_data(G_OBJECT(iftype_cbx), E_CAP_CBX_IFTYPE_NOUPDATE_KEY, GINT_TO_POINTER(0));
+}
+
+static void
+iftype_combo_box_add_remote_host (gpointer key, gpointer value _U_, gpointer user_data)
+{
+ gtk_combo_box_insert_text(GTK_COMBO_BOX(user_data), REMOTE_HOST_START, key);
+
+ if (global_capture_opts.src_type == CAPTURE_IFREMOTE) {
+ /* Ensure we select the correct entry */
+ if (strcmp ((char *)key, global_capture_opts.remote_host) == 0) {
+ gtk_combo_box_set_active(GTK_COMBO_BOX(user_data), REMOTE_HOST_START);
+ }
+ }
+}
+
/* Fill the menu of available types of interfaces */
static GtkWidget *
-iftype_option_menu_new(capture_source value)
+iftype_combo_box_new(void)
{
- GtkWidget *iftype_om, *menu, *menu_item;
- unsigned int i, active = 0;
-
- iftype_om = gtk_option_menu_new();
- menu = gtk_menu_new();
-
- for (i = 0; i < sizeof(iftype) / sizeof(iftype[0]); i++)
- {
- menu_item = gtk_menu_item_new_with_label(iftype[i].name);
- g_object_set_data(G_OBJECT(menu_item), E_CAP_IFTYPE_OM_KEY, iftype_om);
- g_signal_connect(menu_item, "activate", G_CALLBACK(select_if_type_cb),
- GINT_TO_POINTER((int)iftype[i].id));
- gtk_menu_shell_append(GTK_MENU_SHELL(menu), menu_item);
- if (value == iftype[i].id)
- active = i;
- }
+ GtkWidget *iftype_cbx;
+ unsigned int i;
+
+ iftype_cbx = gtk_combo_box_new_text();
+
+ for (i = 0; i < sizeof(iftype) / sizeof(iftype[0]); i++) {
+ gtk_combo_box_append_text(GTK_COMBO_BOX(iftype_cbx), iftype[i].name);
+ }
+
+ if (g_hash_table_size (remote_host_list) > 0) {
+ /* Add remote hosts */
+ iftype_combo_box_add_remote_separators (iftype_cbx);
+ g_hash_table_foreach (remote_host_list, iftype_combo_box_add_remote_host, iftype_cbx);
+ }
+
+ if (global_capture_opts.src_type == CAPTURE_IFLOCAL) {
+ gtk_combo_box_set_active(GTK_COMBO_BOX(iftype_cbx), CAPTURE_IFLOCAL);
+ } else {
+ int iftype = gtk_combo_box_get_active(GTK_COMBO_BOX(iftype_cbx));
+ g_object_set_data(G_OBJECT(iftype_cbx), E_CAP_CBX_IFTYPE_VALUE_KEY, GINT_TO_POINTER(iftype));
+ }
+ g_signal_connect(iftype_cbx, "changed", G_CALLBACK(select_if_type_cb), NULL);
+
+ return iftype_cbx;
+}
- gtk_menu_set_active(GTK_MENU(menu), active);
- gtk_option_menu_set_menu(GTK_OPTION_MENU(iftype_om), menu);
+#if GTK_CHECK_VERSION(2,6,0)
+static gboolean
+iftype_combo_is_separator (GtkTreeModel *model, GtkTreeIter *iter, gpointer data _U_)
+{
+ gboolean result = FALSE;
+ gchar *string;
+
+ gtk_tree_model_get(model, iter, 0, &string, -1);
+ if (string) {
+ result = !strcmp (string, REMOTE_HOST_SEPARATOR);
+ g_free (string);
+ }
- return iftype_om;
+ return result;
+
+}
+#endif
+
+static void
+error_list_remote_interface_cb (gpointer dialog _U_, gint btn _U_, gpointer data)
+{
+ capture_remote_cb(GTK_WIDGET(data), FALSE);
}
/* Retrieve the list of local or remote interfaces according to selected
static void
update_interface_list()
{
- GtkWidget *if_cb, *iftype_om, *remote_bt;
- GList *if_list, *combo_list;
- int err;
- gchar *err_str;
-
- if (cap_open_w == NULL)
- return;
-
- if_cb = (GtkWidget *)g_object_get_data(G_OBJECT(cap_open_w), E_CAP_IFACE_KEY);
- iftype_om = g_object_get_data(G_OBJECT(cap_open_w), E_CAP_IFTYPE_OM_KEY);
- remote_bt = g_object_get_data(G_OBJECT(iftype_om), E_OPT_REMOTE_BT_KEY);
-
- if (global_capture_opts.src_type == CAPTURE_IFREMOTE)
- if_list = get_remote_interface_list(global_capture_opts.remote_host,
- global_capture_opts.remote_port,
- global_capture_opts.auth_type,
- global_capture_opts.auth_username,
- global_capture_opts.auth_password,
- &err, &err_str);
- else
- if_list = capture_interface_list(&err, &err_str);
+ GtkWidget *if_cb, *iftype_cbx, *remote_bt;
+ GList *if_list, *combo_list;
+ int iftype, prev_iftype, err;
+ gchar *err_str;
- if (if_list == NULL && err == CANT_GET_INTERFACE_LIST) {
- simple_dialog(ESD_TYPE_ERROR, ESD_BTN_OK, "%s", err_str);
- g_free(err_str);
+ if (cap_open_w == NULL)
+ return;
- if (global_capture_opts.src_type == CAPTURE_IFREMOTE) {
- GtkWidget *menu;
+ if_cb = (GtkWidget *)g_object_get_data(G_OBJECT(cap_open_w), E_CAP_IFACE_KEY);
+ iftype_cbx = g_object_get_data(G_OBJECT(cap_open_w), E_CAP_IFTYPE_CBX_KEY);
+ remote_bt = g_object_get_data(G_OBJECT(iftype_cbx), E_OPT_REMOTE_BT_KEY);
+ iftype = GPOINTER_TO_INT(g_object_get_data(G_OBJECT(iftype_cbx),
+ E_CAP_CBX_IFTYPE_VALUE_KEY));
- /* Fall back to local interfaces */
- global_capture_opts.src_type = CAPTURE_IFLOCAL;
- g_object_set_data(G_OBJECT(iftype_om), E_CAP_OM_IFTYPE_VALUE_KEY,
- GINT_TO_POINTER(CAPTURE_IFLOCAL));
+ if_list = (GList *) g_object_get_data(G_OBJECT(cap_open_w), E_CAP_IF_LIST_KEY);
+ if (if_list) {
+ free_interface_list(if_list);
+ }
+ if (iftype >= CAPTURE_IFREMOTE) {
+ if_list = get_remote_interface_list(global_capture_opts.remote_host,
+ global_capture_opts.remote_port,
+ global_capture_opts.auth_type,
+ global_capture_opts.auth_username,
+ global_capture_opts.auth_password,
+ &err, &err_str);
+ g_object_set_data(G_OBJECT(cap_open_w), E_CAP_IF_LIST_KEY, if_list);
+ } else {
+ if_list = capture_interface_list(&err, &err_str);
+ g_object_set_data(G_OBJECT(cap_open_w), E_CAP_IF_LIST_KEY, NULL);
+ }
- menu = gtk_option_menu_get_menu(GTK_OPTION_MENU(iftype_om));
- gtk_menu_set_active(GTK_MENU(menu), CAPTURE_IFLOCAL);
- return;
- }
+ if (if_list == NULL && err == CANT_GET_INTERFACE_LIST) {
+ gpointer dialog = simple_dialog(ESD_TYPE_ERROR, ESD_BTN_OK, "%s", err_str);
+ g_free(err_str);
- gtk_combo_set_popdown_strings(GTK_COMBO(if_cb), NULL);
- gtk_entry_set_text(GTK_ENTRY(GTK_COMBO(if_cb)->entry), "");
+ if (iftype >= CAPTURE_IFREMOTE) {
+ /* Fall back to previous interface list */
+ simple_dialog_set_cb(dialog, error_list_remote_interface_cb, iftype_cbx);
+ prev_iftype = GPOINTER_TO_INT(g_object_get_data(G_OBJECT(iftype_cbx),
+ E_CAP_CBX_PREV_IFTYPE_VALUE_KEY));
+ g_object_set_data(G_OBJECT(iftype_cbx), E_CAP_CBX_IFTYPE_VALUE_KEY, GINT_TO_POINTER(prev_iftype));
+ return;
}
- combo_list = build_capture_combo_list(if_list, TRUE);
- gtk_combo_set_popdown_strings(GTK_COMBO(if_cb), combo_list);
- if (combo_list == NULL)
- gtk_entry_set_text(GTK_ENTRY(GTK_COMBO(if_cb)->entry), "");
- free_capture_combo_list(combo_list);
- free_interface_list(if_list);
+ gtk_combo_set_popdown_strings(GTK_COMBO(if_cb), NULL);
+ gtk_entry_set_text(GTK_ENTRY(GTK_COMBO(if_cb)->entry), "");
+ } else if (iftype == CAPTURE_IFREMOTE) {
+ /* New remote interface */
+ iftype_combo_box_add (iftype_cbx);
+ }
+ combo_list = build_capture_combo_list(if_list, TRUE);
+ gtk_combo_set_popdown_strings(GTK_COMBO(if_cb), combo_list);
+ if (combo_list == NULL)
+ gtk_entry_set_text(GTK_ENTRY(GTK_COMBO(if_cb)->entry), "");
+
+ free_capture_combo_list(combo_list);
- if (global_capture_opts.src_type == CAPTURE_IFREMOTE)
- gtk_widget_set_sensitive(remote_bt, TRUE);
- else
- gtk_widget_set_sensitive(remote_bt, FALSE);
+ if (iftype == CAPTURE_IFLOCAL) {
+ /* Only delete if fetched local */
+ free_interface_list(if_list);
+ gtk_widget_set_sensitive(remote_bt, FALSE);
+ } else {
+ gtk_widget_set_sensitive(remote_bt, TRUE);
+ }
}
/* User changed an interface entry of "Remote interface" dialog */
static void
capture_remote_adjust_sensitivity(GtkWidget *tb _U_, gpointer parent_w)
{
- GtkWidget *auth_passwd_rb,
- *username_lb, *username_te,
- *passwd_lb, *passwd_te;
- gboolean state;
+ GtkWidget *auth_passwd_rb,
+ *username_lb, *username_te,
+ *passwd_lb, *passwd_te;
+ gboolean state;
- auth_passwd_rb = (GtkWidget *)g_object_get_data(G_OBJECT(parent_w),
+ auth_passwd_rb = (GtkWidget *)g_object_get_data(G_OBJECT(parent_w),
E_REMOTE_AUTH_PASSWD_KEY);
- username_lb = (GtkWidget *)g_object_get_data(G_OBJECT(parent_w),
- E_REMOTE_USERNAME_LB_KEY);
- username_te = (GtkWidget *)g_object_get_data(G_OBJECT(parent_w),
- E_REMOTE_USERNAME_TE_KEY);
- passwd_lb = (GtkWidget *)g_object_get_data(G_OBJECT(parent_w), E_REMOTE_PASSWD_LB_KEY);
- passwd_te = (GtkWidget *)g_object_get_data(G_OBJECT(parent_w), E_REMOTE_PASSWD_TE_KEY);
-
- state = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(auth_passwd_rb));
- gtk_widget_set_sensitive(GTK_WIDGET(username_lb), state);
- gtk_widget_set_sensitive(GTK_WIDGET(username_te), state);
- gtk_widget_set_sensitive(GTK_WIDGET(passwd_lb), state);
- gtk_widget_set_sensitive(GTK_WIDGET(passwd_te), state);
+ username_lb = (GtkWidget *)g_object_get_data(G_OBJECT(parent_w),
+ E_REMOTE_USERNAME_LB_KEY);
+ username_te = (GtkWidget *)g_object_get_data(G_OBJECT(parent_w),
+ E_REMOTE_USERNAME_TE_KEY);
+ passwd_lb = (GtkWidget *)g_object_get_data(G_OBJECT(parent_w), E_REMOTE_PASSWD_LB_KEY);
+ passwd_te = (GtkWidget *)g_object_get_data(G_OBJECT(parent_w), E_REMOTE_PASSWD_TE_KEY);
+
+ state = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(auth_passwd_rb));
+ gtk_widget_set_sensitive(GTK_WIDGET(username_lb), state);
+ gtk_widget_set_sensitive(GTK_WIDGET(username_te), state);
+ gtk_widget_set_sensitive(GTK_WIDGET(passwd_lb), state);
+ gtk_widget_set_sensitive(GTK_WIDGET(passwd_te), state);
}
/* user requested to destroy the dialog */
static void
capture_remote_ok_cb(GtkWidget *win _U_, GtkWidget *remote_w)
{
- GtkWidget *host_te, *port_te, *auth_pwd_rb, *username_te, *passwd_te,
- *auth_null_rb, *auth_passwd_rb;
+ GtkWidget *host_te, *port_te, *auth_pwd_rb, *username_te, *passwd_te,
+ *auth_null_rb, *auth_passwd_rb, *iftype_cbx;
+ int prev_iftype;
- if (remote_w == NULL)
- return;
+ if (remote_w == NULL)
+ return;
- host_te = (GtkWidget *)g_object_get_data(G_OBJECT(remote_w), E_REMOTE_HOST_TE_KEY);
- port_te = (GtkWidget *)g_object_get_data(G_OBJECT(remote_w), E_REMOTE_PORT_TE_KEY);
- auth_pwd_rb = (GtkWidget *)g_object_get_data(G_OBJECT(remote_w),
- E_REMOTE_AUTH_PASSWD_KEY);
- username_te = (GtkWidget *)g_object_get_data(G_OBJECT(remote_w),
- E_REMOTE_USERNAME_TE_KEY);
- passwd_te = (GtkWidget *)g_object_get_data(G_OBJECT(remote_w), E_REMOTE_PASSWD_TE_KEY);
- auth_null_rb = (GtkWidget *) g_object_get_data(G_OBJECT(remote_w), E_REMOTE_AUTH_NULL_KEY);
- auth_passwd_rb = (GtkWidget *) g_object_get_data(G_OBJECT(remote_w), E_REMOTE_AUTH_PASSWD_KEY);
-
- g_free(global_capture_opts.remote_host);
- global_capture_opts.remote_host = g_strdup(gtk_entry_get_text(GTK_ENTRY(host_te)));
- g_free(global_capture_opts.remote_port);
- global_capture_opts.remote_port = g_strdup(gtk_entry_get_text(GTK_ENTRY(port_te)));
- if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(auth_passwd_rb)))
- global_capture_opts.auth_type = CAPTURE_AUTH_PWD;
- else
- global_capture_opts.auth_type = CAPTURE_AUTH_NULL;
+ host_te = (GtkWidget *)g_object_get_data(G_OBJECT(remote_w), E_REMOTE_HOST_TE_KEY);
+ port_te = (GtkWidget *)g_object_get_data(G_OBJECT(remote_w), E_REMOTE_PORT_TE_KEY);
+ auth_pwd_rb = (GtkWidget *)g_object_get_data(G_OBJECT(remote_w),
+ E_REMOTE_AUTH_PASSWD_KEY);
+ username_te = (GtkWidget *)g_object_get_data(G_OBJECT(remote_w),
+ E_REMOTE_USERNAME_TE_KEY);
+ passwd_te = (GtkWidget *)g_object_get_data(G_OBJECT(remote_w), E_REMOTE_PASSWD_TE_KEY);
+ auth_null_rb = (GtkWidget *) g_object_get_data(G_OBJECT(remote_w), E_REMOTE_AUTH_NULL_KEY);
+ auth_passwd_rb = (GtkWidget *) g_object_get_data(G_OBJECT(remote_w), E_REMOTE_AUTH_PASSWD_KEY);
+ iftype_cbx = g_object_get_data(G_OBJECT(cap_open_w), E_CAP_IFTYPE_CBX_KEY);
+ prev_iftype = GPOINTER_TO_INT(g_object_get_data(G_OBJECT(iftype_cbx),
+ E_CAP_CBX_IFTYPE_VALUE_KEY));
+
+ g_free(global_capture_opts.remote_host);
+ global_capture_opts.remote_host = g_strdup(gtk_entry_get_text(GTK_ENTRY(host_te)));
+ g_free(global_capture_opts.remote_port);
+ global_capture_opts.remote_port = g_strdup(gtk_entry_get_text(GTK_ENTRY(port_te)));
+ if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(auth_passwd_rb)))
+ global_capture_opts.auth_type = CAPTURE_AUTH_PWD;
+ else
+ global_capture_opts.auth_type = CAPTURE_AUTH_NULL;
- g_free(global_capture_opts.auth_username);
- global_capture_opts.auth_username =
- g_strdup(gtk_entry_get_text(GTK_ENTRY(username_te)));
+ g_free(global_capture_opts.auth_username);
+ global_capture_opts.auth_username =
+ g_strdup(gtk_entry_get_text(GTK_ENTRY(username_te)));
- g_free(global_capture_opts.auth_password);
- global_capture_opts.auth_password =
- g_strdup(gtk_entry_get_text(GTK_ENTRY(passwd_te)));
+ g_free(global_capture_opts.auth_password);
+ global_capture_opts.auth_password =
+ g_strdup(gtk_entry_get_text(GTK_ENTRY(passwd_te)));
- global_capture_opts.src_type = CAPTURE_IFREMOTE;
+ g_object_set_data(G_OBJECT(iftype_cbx), E_CAP_CBX_PREV_IFTYPE_VALUE_KEY,
+ GINT_TO_POINTER(prev_iftype));
+ g_object_set_data(G_OBJECT(iftype_cbx), E_CAP_CBX_IFTYPE_VALUE_KEY,
+ GINT_TO_POINTER(CAPTURE_IFREMOTE));
+
+ window_destroy(GTK_WIDGET(remote_w));
+ update_interface_list();
+}
+
+static void
+capture_remote_cancel_cb(GtkWidget *win, gpointer data)
+{
+ GtkWidget *iftype_cbx;
+ int old_iftype;
- window_destroy(GTK_WIDGET(remote_w));
- update_interface_list();
+ iftype_cbx = g_object_get_data(G_OBJECT(cap_open_w), E_CAP_IFTYPE_CBX_KEY);
+ old_iftype = GPOINTER_TO_INT(g_object_get_data(G_OBJECT(iftype_cbx),
+ E_CAP_CBX_PREV_IFTYPE_VALUE_KEY));
+ gtk_combo_box_set_active(GTK_COMBO_BOX(iftype_cbx), old_iftype);
+
+ window_cancel_button_cb (win, data);
}
/* Show remote capture interface parameters dialog */
static void
-capture_remote_cb(GtkWidget *w, gpointer d _U_)
+capture_remote_cb(GtkWidget *w, gboolean focus_username)
{
- GtkWidget *caller, *remote_w,
- *main_vb, *host_tb,
- *host_lb, *host_te, *port_lb, *port_te,
- *auth_fr, *auth_vb,
- *auth_null_rb, *auth_passwd_rb, *auth_passwd_tb,
- *user_lb, *user_te, *passwd_lb, *passwd_te,
- *bbox, *ok_bt, *cancel_bt;
- gchar *title;
- GtkTooltips *tooltips;
- GSList *auth_group;
-
- caller = gtk_widget_get_toplevel(w);
- remote_w = g_object_get_data(G_OBJECT(caller), E_CAP_REMOTE_DIALOG_PTR_KEY);
- if (remote_w != NULL)
- {
- reactivate_window(remote_w);
- return;
- }
+ GtkWidget *caller, *remote_w,
+ *main_vb, *host_tb,
+ *host_lb, *host_te, *port_lb, *port_te,
+ *auth_fr, *auth_vb,
+ *auth_null_rb, *auth_passwd_rb, *auth_passwd_tb,
+ *user_lb, *user_te, *passwd_lb, *passwd_te,
+ *bbox, *ok_bt, *cancel_bt;
+ gchar *title;
+ GtkTooltips *tooltips;
+ GSList *auth_group;
- title = create_user_window_title("Wireshark: Remote Interface");
- remote_w = dlg_window_new(title);
- g_object_set_data(G_OBJECT(remote_w), E_CAP_REMOTE_CALLER_PTR_KEY, caller);
- g_object_set_data(G_OBJECT(caller), E_CAP_REMOTE_DIALOG_PTR_KEY, remote_w);
- g_free(title);
-
- tooltips = gtk_tooltips_new();
-
- main_vb = gtk_vbox_new(FALSE, 0);
- gtk_container_set_border_width(GTK_CONTAINER(main_vb), 5);
- gtk_container_add(GTK_CONTAINER(remote_w), main_vb);
-
- /* Host/port table */
- host_tb = gtk_table_new(2, 2, FALSE);
- gtk_table_set_row_spacings(GTK_TABLE(host_tb), 3);
- gtk_table_set_col_spacings(GTK_TABLE(host_tb), 3);
- gtk_box_pack_start(GTK_BOX(main_vb), host_tb, FALSE, FALSE, 0);
-
- /* Host row */
- host_lb = gtk_label_new("Host:");
- gtk_table_attach_defaults(GTK_TABLE(host_tb), host_lb, 0, 1, 0, 1);
-
- host_te = gtk_entry_new();
- gtk_tooltips_set_tip(tooltips, host_te,
- "Enter the hostname or host IP address to be used as a source "
- "for remote capture.", NULL);
- gtk_table_attach_defaults(GTK_TABLE(host_tb), host_te, 1, 2, 0, 1);
- if (global_capture_opts.remote_host != NULL)
- gtk_entry_set_text(GTK_ENTRY(host_te), global_capture_opts.remote_host);
-
- /* Port row */
- port_lb = gtk_label_new("Port:");
- gtk_table_attach_defaults(GTK_TABLE(host_tb), port_lb, 0, 1, 1, 2);
-
- port_te = gtk_entry_new();
- gtk_tooltips_set_tip(tooltips, port_te,
- "Enter the TCP port number used by RPCAP server at remote host "
- "(leave it empty for default port number).", NULL);
- gtk_table_attach_defaults(GTK_TABLE(host_tb), port_te, 1, 2, 1, 2);
- if (global_capture_opts.remote_port != NULL)
- gtk_entry_set_text(GTK_ENTRY(port_te), global_capture_opts.remote_port);
-
- /* Authentication options frame */
- auth_fr = gtk_frame_new("Authentication");
- gtk_container_add(GTK_CONTAINER(main_vb), auth_fr);
-
- auth_vb = gtk_vbox_new(FALSE, 3);
- gtk_container_set_border_width(GTK_CONTAINER(auth_vb), 5);
- gtk_container_add(GTK_CONTAINER(auth_fr), auth_vb);
-
- auth_null_rb = gtk_radio_button_new_with_label(NULL,
- "Null authentication");
- gtk_box_pack_start(GTK_BOX(auth_vb), auth_null_rb, TRUE, TRUE, 0);
-
- auth_group = gtk_radio_button_get_group(GTK_RADIO_BUTTON(auth_null_rb));
- auth_passwd_rb = gtk_radio_button_new_with_label(auth_group,
- "Password authentication");
- gtk_box_pack_start(GTK_BOX(auth_vb), auth_passwd_rb, TRUE, TRUE, 0);
- g_signal_connect(auth_passwd_rb, "toggled",
- G_CALLBACK(capture_remote_adjust_sensitivity), remote_w);
+ caller = gtk_widget_get_toplevel(w);
+ remote_w = g_object_get_data(G_OBJECT(caller), E_CAP_REMOTE_DIALOG_PTR_KEY);
+ if (remote_w != NULL) {
+ reactivate_window(remote_w);
+ return;
+ }
+
+ title = create_user_window_title("Wireshark: Remote Interface");
+ remote_w = dlg_window_new(title);
+ g_object_set_data(G_OBJECT(remote_w), E_CAP_REMOTE_CALLER_PTR_KEY, caller);
+ g_object_set_data(G_OBJECT(caller), E_CAP_REMOTE_DIALOG_PTR_KEY, remote_w);
+ g_free(title);
- auth_passwd_tb = gtk_table_new(2, 2, FALSE);
- gtk_table_set_row_spacings(GTK_TABLE(auth_passwd_tb), 3);
- gtk_table_set_col_spacings(GTK_TABLE(auth_passwd_tb), 3);
- gtk_box_pack_start(GTK_BOX(auth_vb), auth_passwd_tb, FALSE, FALSE, 0);
+ tooltips = gtk_tooltips_new();
- user_lb = gtk_label_new("Username:");
- gtk_table_attach_defaults(GTK_TABLE(auth_passwd_tb), user_lb, 0, 1, 0, 1);
+ main_vb = gtk_vbox_new(FALSE, 0);
+ gtk_container_set_border_width(GTK_CONTAINER(main_vb), 5);
+ gtk_container_add(GTK_CONTAINER(remote_w), main_vb);
+
+ /* Host/port table */
+ host_tb = gtk_table_new(2, 2, FALSE);
+ gtk_table_set_row_spacings(GTK_TABLE(host_tb), 3);
+ gtk_table_set_col_spacings(GTK_TABLE(host_tb), 3);
+ gtk_box_pack_start(GTK_BOX(main_vb), host_tb, FALSE, FALSE, 0);
+
+ /* Host row */
+ host_lb = gtk_label_new("Host:");
+ gtk_table_attach_defaults(GTK_TABLE(host_tb), host_lb, 0, 1, 0, 1);
+
+ host_te = gtk_entry_new();
+ gtk_tooltips_set_tip(tooltips, host_te,
+ "Enter the hostname or host IP address to be used as a source "
+ "for remote capture.", NULL);
+ gtk_table_attach_defaults(GTK_TABLE(host_tb), host_te, 1, 2, 0, 1);
+ if (global_capture_opts.remote_host != NULL)
+ gtk_entry_set_text(GTK_ENTRY(host_te), global_capture_opts.remote_host);
+
+ /* Port row */
+ port_lb = gtk_label_new("Port:");
+ gtk_table_attach_defaults(GTK_TABLE(host_tb), port_lb, 0, 1, 1, 2);
+
+ port_te = gtk_entry_new();
+ gtk_tooltips_set_tip(tooltips, port_te,
+ "Enter the TCP port number used by RPCAP server at remote host "
+ "(leave it empty for default port number).", NULL);
+ gtk_table_attach_defaults(GTK_TABLE(host_tb), port_te, 1, 2, 1, 2);
+ if (global_capture_opts.remote_port != NULL)
+ gtk_entry_set_text(GTK_ENTRY(port_te), global_capture_opts.remote_port);
+
+ /* Authentication options frame */
+ auth_fr = gtk_frame_new("Authentication");
+ gtk_container_add(GTK_CONTAINER(main_vb), auth_fr);
+
+ auth_vb = gtk_vbox_new(FALSE, 3);
+ gtk_container_set_border_width(GTK_CONTAINER(auth_vb), 5);
+ gtk_container_add(GTK_CONTAINER(auth_fr), auth_vb);
+
+ auth_null_rb = gtk_radio_button_new_with_label(NULL,
+ "Null authentication");
+ gtk_box_pack_start(GTK_BOX(auth_vb), auth_null_rb, TRUE, TRUE, 0);
+
+ auth_group = gtk_radio_button_get_group(GTK_RADIO_BUTTON(auth_null_rb));
+ auth_passwd_rb = gtk_radio_button_new_with_label(auth_group,
+ "Password authentication");
+ gtk_box_pack_start(GTK_BOX(auth_vb), auth_passwd_rb, TRUE, TRUE, 0);
+ g_signal_connect(auth_passwd_rb, "toggled",
+ G_CALLBACK(capture_remote_adjust_sensitivity), remote_w);
- user_te = gtk_entry_new();
- gtk_table_attach_defaults(GTK_TABLE(auth_passwd_tb), user_te, 1, 2, 0, 1);
- if (global_capture_opts.auth_username != NULL)
- gtk_entry_set_text(GTK_ENTRY(user_te), global_capture_opts.auth_username);
+ auth_passwd_tb = gtk_table_new(2, 2, FALSE);
+ gtk_table_set_row_spacings(GTK_TABLE(auth_passwd_tb), 3);
+ gtk_table_set_col_spacings(GTK_TABLE(auth_passwd_tb), 3);
+ gtk_box_pack_start(GTK_BOX(auth_vb), auth_passwd_tb, FALSE, FALSE, 0);
- passwd_lb = gtk_label_new("Password:");
- gtk_table_attach_defaults(GTK_TABLE(auth_passwd_tb), passwd_lb, 0, 1, 1, 2);
+ user_lb = gtk_label_new("Username:");
+ gtk_table_attach_defaults(GTK_TABLE(auth_passwd_tb), user_lb, 0, 1, 0, 1);
- passwd_te = gtk_entry_new();
- gtk_entry_set_visibility(GTK_ENTRY(passwd_te), FALSE);
- gtk_table_attach_defaults(GTK_TABLE(auth_passwd_tb), passwd_te, 1, 2, 1, 2);
- if (global_capture_opts.auth_password != NULL)
- gtk_entry_set_text(GTK_ENTRY(passwd_te), global_capture_opts.auth_password);
+ user_te = gtk_entry_new();
+ gtk_table_attach_defaults(GTK_TABLE(auth_passwd_tb), user_te, 1, 2, 0, 1);
+ if (global_capture_opts.auth_username != NULL)
+ gtk_entry_set_text(GTK_ENTRY(user_te), global_capture_opts.auth_username);
- /* Button row: "Start" and "Cancel" buttons */
- bbox = dlg_button_row_new(GTK_STOCK_OK, GTK_STOCK_CANCEL, NULL);
- gtk_box_pack_start(GTK_BOX(main_vb), bbox, FALSE, FALSE, 5);
+ passwd_lb = gtk_label_new("Password:");
+ gtk_table_attach_defaults(GTK_TABLE(auth_passwd_tb), passwd_lb, 0, 1, 1, 2);
- ok_bt = g_object_get_data(G_OBJECT(bbox), GTK_STOCK_OK);
- g_signal_connect(ok_bt, "clicked", G_CALLBACK(capture_remote_ok_cb), remote_w);
- gtk_tooltips_set_tip(tooltips, ok_bt,
- "Accept remote host parameters and lookup "
- "remote interfaces.", NULL);
+ passwd_te = gtk_entry_new();
+ gtk_entry_set_visibility(GTK_ENTRY(passwd_te), FALSE);
+ gtk_table_attach_defaults(GTK_TABLE(auth_passwd_tb), passwd_te, 1, 2, 1, 2);
+ if (global_capture_opts.auth_password != NULL)
+ gtk_entry_set_text(GTK_ENTRY(passwd_te), global_capture_opts.auth_password);
- cancel_bt = g_object_get_data(G_OBJECT(bbox), GTK_STOCK_CANCEL);
- gtk_tooltips_set_tip(tooltips, cancel_bt,
- "Cancel and exit dialog.", NULL);
- window_set_cancel_button(remote_w, cancel_bt, window_cancel_button_cb);
+ /* Button row: "Start" and "Cancel" buttons */
+ bbox = dlg_button_row_new(GTK_STOCK_OK, GTK_STOCK_CANCEL, NULL);
+ gtk_box_pack_start(GTK_BOX(main_vb), bbox, FALSE, FALSE, 5);
- gtk_widget_grab_default(ok_bt);
+ ok_bt = g_object_get_data(G_OBJECT(bbox), GTK_STOCK_OK);
+ g_signal_connect(ok_bt, "clicked", G_CALLBACK(capture_remote_ok_cb), remote_w);
+ gtk_tooltips_set_tip(tooltips, ok_bt,
+ "Accept remote host parameters and lookup "
+ "remote interfaces.", NULL);
+
+ cancel_bt = g_object_get_data(G_OBJECT(bbox), GTK_STOCK_CANCEL);
+ gtk_tooltips_set_tip(tooltips, cancel_bt,
+ "Cancel and exit dialog.", NULL);
+ window_set_cancel_button(remote_w, cancel_bt, capture_remote_cancel_cb);
- g_signal_connect(remote_w, "delete_event", G_CALLBACK(window_delete_event_cb), NULL);
- g_signal_connect(remote_w, "destroy", G_CALLBACK(capture_remote_destroy_cb), NULL);
+ if (focus_username) {
+ /* Give the initial focus to the "Username" entry box. */
+ gtk_widget_grab_focus(user_te);
+ }
- g_object_set_data(G_OBJECT(remote_w), E_REMOTE_HOST_TE_KEY, host_te);
- g_object_set_data(G_OBJECT(remote_w), E_REMOTE_PORT_TE_KEY, port_te);
- g_object_set_data(G_OBJECT(remote_w), E_REMOTE_AUTH_NULL_KEY, auth_null_rb);
- g_object_set_data(G_OBJECT(remote_w), E_REMOTE_AUTH_PASSWD_KEY, auth_passwd_rb);
- g_object_set_data(G_OBJECT(remote_w), E_REMOTE_USERNAME_LB_KEY, user_lb);
- g_object_set_data(G_OBJECT(remote_w), E_REMOTE_USERNAME_TE_KEY, user_te);
- g_object_set_data(G_OBJECT(remote_w), E_REMOTE_PASSWD_LB_KEY, passwd_lb);
- g_object_set_data(G_OBJECT(remote_w), E_REMOTE_PASSWD_TE_KEY, passwd_te);
+ gtk_widget_grab_default(ok_bt);
- if (global_capture_opts.auth_type == CAPTURE_AUTH_PWD)
- gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(auth_passwd_rb), TRUE);
- else
- gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(auth_null_rb), TRUE);
- capture_remote_adjust_sensitivity(NULL, remote_w);
+ /* Catch the "activate" signal on the text
+ entries, so that if the user types Return there, we act as if the
+ "OK" button had been selected, as happens if Return is typed if some
+ widget that *doesn't* handle the Return key has the input focus. */
+ dlg_set_activate(host_te, ok_bt);
+ dlg_set_activate(port_te, ok_bt);
+ dlg_set_activate(user_te, ok_bt);
+ dlg_set_activate(passwd_te, ok_bt);
+
+ g_signal_connect(remote_w, "delete_event", G_CALLBACK(window_delete_event_cb), NULL);
+ g_signal_connect(remote_w, "destroy", G_CALLBACK(capture_remote_destroy_cb), NULL);
+
+ g_object_set_data(G_OBJECT(remote_w), E_REMOTE_HOST_TE_KEY, host_te);
+ g_object_set_data(G_OBJECT(remote_w), E_REMOTE_PORT_TE_KEY, port_te);
+ g_object_set_data(G_OBJECT(remote_w), E_REMOTE_AUTH_NULL_KEY, auth_null_rb);
+ g_object_set_data(G_OBJECT(remote_w), E_REMOTE_AUTH_PASSWD_KEY, auth_passwd_rb);
+ g_object_set_data(G_OBJECT(remote_w), E_REMOTE_USERNAME_LB_KEY, user_lb);
+ g_object_set_data(G_OBJECT(remote_w), E_REMOTE_USERNAME_TE_KEY, user_te);
+ g_object_set_data(G_OBJECT(remote_w), E_REMOTE_PASSWD_LB_KEY, passwd_lb);
+ g_object_set_data(G_OBJECT(remote_w), E_REMOTE_PASSWD_TE_KEY, passwd_te);
+
+ if (global_capture_opts.auth_type == CAPTURE_AUTH_PWD)
+ gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(auth_passwd_rb), TRUE);
+ else
+ gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(auth_null_rb), TRUE);
+ capture_remote_adjust_sensitivity(NULL, remote_w);
- gtk_widget_show_all(remote_w);
- window_present(remote_w);
+ gtk_widget_show_all(remote_w);
+ window_present(remote_w);
}
/* user requested to destroy the dialog */
*samp_count_sb, *samp_timer_sb;
#endif
- if (parent_w == NULL)
- return;
+ if (parent_w == NULL)
+ return;
datatx_udp_cb = (GtkWidget *) g_object_get_data(G_OBJECT(parent_w), E_CAP_DATATX_UDP_CB_KEY);
nocap_rpcap_cb = (GtkWidget *) g_object_get_data(G_OBJECT(parent_w), E_CAP_NOCAP_RPCAP_CB_KEY);
+ global_capture_opts.datatx_udp =
+ gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(datatx_udp_cb));
+ global_capture_opts.nocap_rpcap =
+ gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(nocap_rpcap_cb));
+
#ifdef HAVE_PCAP_SETSAMPLING
samp_none_rb = (GtkWidget *) g_object_get_data(G_OBJECT(parent_w), E_CAP_SAMP_NONE_RB_KEY);
samp_count_rb = (GtkWidget *) g_object_get_data(G_OBJECT(parent_w), E_CAP_SAMP_COUNT_RB_KEY);
samp_timer_rb = (GtkWidget *) g_object_get_data(G_OBJECT(parent_w), E_CAP_SAMP_TIMER_RB_KEY);
samp_count_sb = (GtkWidget *) g_object_get_data(G_OBJECT(parent_w), E_CAP_SAMP_COUNT_SB_KEY);
samp_timer_sb = (GtkWidget *) g_object_get_data(G_OBJECT(parent_w), E_CAP_SAMP_TIMER_SB_KEY);
-#endif
- global_capture_opts.datatx_udp =
- gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(datatx_udp_cb));
- global_capture_opts.nocap_rpcap =
- gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(nocap_rpcap_cb));
-
-#ifdef HAVE_PCAP_SETSAMPLING
- if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(samp_none_rb)))
- global_capture_opts.sampling_method = CAPTURE_SAMP_NONE;
- else if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(samp_count_rb)))
- {
- global_capture_opts.sampling_method = CAPTURE_SAMP_BY_COUNT;
- global_capture_opts.sampling_param = gtk_spin_button_get_value_as_int(
- GTK_SPIN_BUTTON(samp_count_sb));
- }
- else if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(samp_timer_rb)))
- {
- global_capture_opts.sampling_method = CAPTURE_SAMP_BY_TIMER;
- global_capture_opts.sampling_param = gtk_spin_button_get_value_as_int(
- GTK_SPIN_BUTTON(samp_timer_sb));
- }
+ if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(samp_none_rb)))
+ global_capture_opts.sampling_method = CAPTURE_SAMP_NONE;
+ else if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(samp_count_rb))) {
+ global_capture_opts.sampling_method = CAPTURE_SAMP_BY_COUNT;
+ global_capture_opts.sampling_param = gtk_spin_button_get_value_as_int(GTK_SPIN_BUTTON(samp_count_sb));
+ } else if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(samp_timer_rb))) {
+ global_capture_opts.sampling_method = CAPTURE_SAMP_BY_TIMER;
+ global_capture_opts.sampling_param = gtk_spin_button_get_value_as_int(GTK_SPIN_BUTTON(samp_timer_sb));
+ }
#endif
- window_destroy(GTK_WIDGET(parent_w));
+ window_destroy(GTK_WIDGET(parent_w));
}
#ifdef HAVE_PCAP_SETSAMPLING
gtk_container_set_border_width(GTK_CONTAINER(capture_vb), 5);
gtk_container_add(GTK_CONTAINER(capture_fr), capture_vb);
- nocap_rpcap_cb = gtk_check_button_new_with_mnemonic("Do not capture own traffic");
+ nocap_rpcap_cb = gtk_check_button_new_with_mnemonic("Do not capture own RPCAP traffic");
gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(nocap_rpcap_cb),
global_capture_opts.nocap_rpcap);
gtk_container_add(GTK_CONTAINER(capture_vb), nocap_rpcap_cb);
gtk_widget_show_all(opt_remote_w);
window_present(opt_remote_w);
}
+
+static void
+recent_print_remote_host (gpointer key _U_, gpointer value, gpointer user)
+{
+ FILE *rf = user;
+ struct remote_host *ri = value;
+
+ fprintf (rf, RECENT_KEY_REMOTE_HOST ": %s,%s,%d\n", ri->remote_host, ri->remote_port, ri->auth_type);
+}
+
+void
+capture_remote_combo_recent_write_all(FILE *rf)
+{
+ if (remote_host_list && g_hash_table_size (remote_host_list) > 0) {
+ /* Write all remote interfaces to the recent file */
+ g_hash_table_foreach (remote_host_list, recent_print_remote_host, rf);
+ }
+}
+
+gboolean
+capture_remote_combo_add_recent(gchar *s)
+{
+ GList *vals = prefs_get_string_list (s);
+ GList *valp = vals;
+ struct remote_host *rh;
+ gint auth_type;
+ char *p;
+
+ if (valp == NULL)
+ return FALSE;
+
+ if (remote_host_list == NULL) {
+ remote_host_list = g_hash_table_new (g_str_hash, g_str_equal);
+ }
+
+ rh = g_malloc (sizeof (*rh));
+
+ /* First value is the host */
+ rh->remote_host = g_strdup (valp->data);
+ if (strlen(rh->remote_host) == 0)
+ /* Empty remote host */
+ return FALSE;
+ rh->auth_type = CAPTURE_AUTH_NULL;
+ valp = valp->next;
+
+ if (valp) {
+ /* Found value 2, this is the port number */
+ rh->remote_port = g_strdup (valp->data);
+ valp = valp->next;
+ } else {
+ /* Did not find a port number */
+ rh->remote_port = g_strdup ("");
+ }
+
+ if (valp) {
+ /* Found value 3, this is the authentication type */
+ auth_type = strtol(valp->data, &p, 0);
+ if (p != valp->data && *p == '\0') {
+ rh->auth_type = auth_type;
+ }
+ }
+
+ /* Do not store username and password */
+ rh->auth_username = g_strdup ("");
+ rh->auth_password = g_strdup ("");
+
+ prefs_clear_string_list(vals);
+
+ g_hash_table_insert (remote_host_list, g_strdup(rh->remote_host), rh);
+
+ return TRUE;
+}
+
#endif
/* show capture prepare (options) dialog */
*if_ip_hb, *if_ip_lb, *if_ip_eb,
*linktype_hb, *linktype_lb, *linktype_om,
*snap_hb, *snap_cb, *snap_sb, *snap_lb,
- *promisc_cb,
+ *promisc_cb, *pcap_ng_cb,
*filter_hb, *filter_bt, *filter_te, *filter_cm,
*file_fr, *file_vb,
*file_hb, *file_bt, *file_lb, *file_te,
*multi_tb, *multi_files_on_cb,
- *ring_filesize_cb, *ring_filesize_sb, *ring_filesize_om,
- *file_duration_cb, *file_duration_sb, *file_duration_om,
+ *ring_filesize_cb, *ring_filesize_sb, *ring_filesize_cbx,
+ *file_duration_cb, *file_duration_sb, *file_duration_cbx,
*ringbuffer_nbf_cb, *ringbuffer_nbf_sb, *ringbuffer_nbf_lb,
*stop_files_cb, *stop_files_sb, *stop_files_lb,
*limit_fr, *limit_vb, *limit_tb,
*stop_packets_cb, *stop_packets_sb, *stop_packets_lb,
- *stop_filesize_cb, *stop_filesize_sb, *stop_filesize_om,
- *stop_duration_cb, *stop_duration_sb, *stop_duration_om,
+ *stop_filesize_cb, *stop_filesize_sb, *stop_filesize_cbx,
+ *stop_duration_cb, *stop_duration_sb, *stop_duration_cbx,
*display_fr, *display_vb,
*sync_cb, *auto_scroll_cb, *hide_info_cb,
*help_bt;
#ifdef HAVE_AIRPCAP
GtkWidget *advanced_bt;
- GtkWidget *decryption_cm;
+ GtkWidget *decryption_cb;
#endif
#ifdef HAVE_PCAP_REMOTE
- GtkWidget *iftype_om;
+ GtkWidget *iftype_cbx;
GtkWidget *remote_bt;
#endif
GtkTooltips *tooltips;
}
#endif
+ /* use user-defined title if preference is set */
+ cap_title = create_user_window_title("Wireshark: Capture Options");
+
+ cap_open_w = dlg_window_new(cap_title);
+ g_free(cap_title);
+
+ tooltips = gtk_tooltips_new();
+
#ifdef HAVE_PCAP_REMOTE
- if (global_capture_opts.src_type == CAPTURE_IFREMOTE)
- if_list = get_remote_interface_list(global_capture_opts.remote_host,
- global_capture_opts.remote_port,
- global_capture_opts.auth_type,
- global_capture_opts.auth_username,
- global_capture_opts.auth_password,
- &err, &err_str);
- else
+ if (global_capture_opts.src_type == CAPTURE_IFREMOTE) {
+ if_list = get_remote_interface_list(global_capture_opts.remote_host,
+ global_capture_opts.remote_port,
+ global_capture_opts.auth_type,
+ global_capture_opts.auth_username,
+ global_capture_opts.auth_password,
+ &err, NULL);
+ if (if_list == NULL && err == CANT_GET_INTERFACE_LIST) {
+ /* Silently fall back to local interface list */
+ if (global_capture_opts.iface) {
+ g_free (global_capture_opts.iface);
+ global_capture_opts.iface = NULL;
+ }
+ if (global_capture_opts.iface_descr) {
+ g_free (global_capture_opts.iface_descr);
+ global_capture_opts.iface_descr = NULL;
+ }
if_list = capture_interface_list(&err, &err_str);
+ global_capture_opts.src_type = CAPTURE_IFLOCAL;
+ g_object_set_data(G_OBJECT(cap_open_w), E_CAP_IF_LIST_KEY, NULL);
+ } else {
+ g_object_set_data(G_OBJECT(cap_open_w), E_CAP_IF_LIST_KEY, if_list);
+ }
+ } else {
+ if_list = capture_interface_list(&err, &err_str);
+ g_object_set_data(G_OBJECT(cap_open_w), E_CAP_IF_LIST_KEY, NULL);
+ }
#else
if_list = capture_interface_list(&err, &err_str);
#endif
/* load the airpcap interfaces */
airpcap_if_list = get_airpcap_interface_list(&err, &err_str);
- decryption_cm = g_object_get_data(G_OBJECT(airpcap_tb),AIRPCAP_TOOLBAR_DECRYPTION_KEY);
- update_decryption_mode_list(decryption_cm);
+ decryption_cb = g_object_get_data(G_OBJECT(airpcap_tb),AIRPCAP_TOOLBAR_DECRYPTION_KEY);
+ update_decryption_mode_list(decryption_cb);
if (airpcap_if_list == NULL && err == CANT_GET_AIRPCAP_INTERFACE_LIST) {
simple_dialog(ESD_TYPE_ERROR, ESD_BTN_OK, "%s", err_str);
g_free(err_str);
}
- /* select the first ad default (THIS SHOULD BE CHANGED) */
- airpcap_if_active = airpcap_get_default_if(airpcap_if_list);
+ /* select the first ad default (THIS SHOULD BE CHANGED) */
+ airpcap_if_active = airpcap_get_default_if(airpcap_if_list);
#endif
- /* use user-defined title if preference is set */
- cap_title = create_user_window_title("Wireshark: Capture Options");
-
- cap_open_w = dlg_window_new(cap_title);
- g_free(cap_title);
-
- tooltips = gtk_tooltips_new();
-
main_vb = gtk_vbox_new(FALSE, 0);
gtk_container_set_border_width(GTK_CONTAINER(main_vb), 5);
gtk_container_add(GTK_CONTAINER(cap_open_w), main_vb);
gtk_box_pack_start(GTK_BOX(if_hb), if_lb, FALSE, FALSE, 3);
#ifdef HAVE_PCAP_REMOTE
- iftype_om = iftype_option_menu_new(global_capture_opts.src_type);
- gtk_tooltips_set_tip(tooltips, iftype_om,
+ if (remote_host_list == NULL) {
+ remote_host_list = g_hash_table_new (g_str_hash, g_str_equal);
+ }
+
+ iftype_cbx = iftype_combo_box_new();
+#if GTK_CHECK_VERSION(2,6,0)
+ gtk_combo_box_set_row_separator_func (GTK_COMBO_BOX (iftype_cbx),
+ iftype_combo_is_separator, NULL, NULL);
+#endif
+ g_object_set_data(G_OBJECT(cap_open_w), E_CAP_IFTYPE_CBX_KEY, iftype_cbx);
+ gtk_tooltips_set_tip(tooltips, iftype_cbx,
"Choose to capture from local or remote interfaces.", NULL);
- gtk_box_pack_start(GTK_BOX(if_hb), iftype_om, FALSE, FALSE, 0);
+ gtk_box_pack_start(GTK_BOX(if_hb), iftype_cbx, FALSE, FALSE, 0);
#endif
if_cb = gtk_combo_new();
}
#ifdef HAVE_AIRPCAP
- /* get the airpcap interface (if it IS an airpcap interface, and update the
- toolbar... and of course enable the advanced button...)*/
- airpcap_if_selected = get_airpcap_if_from_name(airpcap_if_list,global_capture_opts.iface);
+ /* get the airpcap interface (if it IS an airpcap interface, and update the
+ toolbar... and of course enable the advanced button...)*/
+ airpcap_if_selected = get_airpcap_if_from_name(airpcap_if_list,global_capture_opts.iface);
#endif
if (global_capture_opts.iface != NULL) {
(char *)combo_list->data);
}
free_capture_combo_list(combo_list);
+#ifdef HAVE_PCAP_REMOTE
+ /* Only delete if fetched local */
+ if (global_capture_opts.src_type == CAPTURE_IFLOCAL)
+#endif
free_interface_list(if_list);
gtk_tooltips_set_tip(tooltips, GTK_COMBO(if_cb)->entry,
"Choose which interface (network card) will be used to capture packets from. "
/* Default to "use the default" */
/* Datalink menu index is not resetted, it will be restored with last used value */
/* g_object_set_data(G_OBJECT(linktype_om), E_CAP_OM_LT_VALUE_KEY, GINT_TO_POINTER(-1)); */
+
g_object_set_data(G_OBJECT(linktype_om), E_CAP_IFACE_KEY, if_ip_lb);
dl_hdr_menu=NULL;
if (linktype_history == NULL) {
"See the FAQ for some more details of capturing packets from a switched network.", NULL);
gtk_container_add(GTK_CONTAINER(left_vb), promisc_cb);
+ /* Pcap-NG row */
+ pcap_ng_cb = gtk_check_button_new_with_mnemonic("Capture packets in pcap-ng format (experimental)");
+ gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(pcap_ng_cb), global_capture_opts.use_pcapng);
+ gtk_tooltips_set_tip(tooltips, pcap_ng_cb, "Capture packets in the next-generation capture file format. "
+ "This is still experimental.", NULL);
+ gtk_container_add(GTK_CONTAINER(left_vb), pcap_ng_cb);
+
/* Capture length row */
snap_hb = gtk_hbox_new(FALSE, 3);
gtk_container_add(GTK_CONTAINER(left_vb), snap_hb);
gtk_box_pack_start (GTK_BOX(snap_hb), snap_sb, FALSE, FALSE, 0);
snap_lb = gtk_label_new("bytes");
- gtk_misc_set_alignment(GTK_MISC(snap_lb), 0, 0.5);
+ gtk_misc_set_alignment(GTK_MISC(snap_lb), 0, 0.5f);
gtk_box_pack_start(GTK_BOX(snap_hb), snap_lb, FALSE, FALSE, 0);
/* Filter row */
/* Both the callback and the data are global */
g_signal_connect(remote_bt,"clicked", G_CALLBACK(options_remote_cb),NULL);
- g_object_set_data(G_OBJECT(iftype_om), E_OPT_REMOTE_BT_KEY, remote_bt);
+ g_object_set_data(G_OBJECT(iftype_cbx), E_OPT_REMOTE_BT_KEY, remote_bt);
if (global_capture_opts.src_type == CAPTURE_IFREMOTE) {
gtk_widget_set_sensitive(remote_bt, TRUE);
gtk_widget_set_size_request(ring_filesize_sb, 80, -1);
gtk_table_attach_defaults(GTK_TABLE(multi_tb), ring_filesize_sb, 1, 2, row, row+1);
- ring_filesize_om = size_unit_option_menu_new(global_capture_opts.autostop_filesize);
- gtk_table_attach_defaults(GTK_TABLE(multi_tb), ring_filesize_om, 2, 3, row, row+1);
+ ring_filesize_cbx = size_unit_combo_box_new(global_capture_opts.autostop_filesize);
+ gtk_table_attach_defaults(GTK_TABLE(multi_tb), ring_filesize_cbx, 2, 3, row, row+1);
- value = size_unit_option_menu_set_value(global_capture_opts.autostop_filesize);
+ value = size_unit_combo_box_set_value(global_capture_opts.autostop_filesize);
gtk_adjustment_set_value(ring_filesize_adj, (gfloat) value);
row++;
gtk_widget_set_size_request(file_duration_sb, 80, -1);
gtk_table_attach_defaults(GTK_TABLE(multi_tb), file_duration_sb, 1, 2, row, row+1);
- file_duration_om = time_unit_option_menu_new(global_capture_opts.file_duration);
- gtk_table_attach_defaults(GTK_TABLE(multi_tb), file_duration_om, 2, 3, row, row+1);
+ file_duration_cbx = time_unit_combo_box_new(global_capture_opts.file_duration);
+ gtk_table_attach_defaults(GTK_TABLE(multi_tb), file_duration_cbx, 2, 3, row, row+1);
- value = time_unit_option_menu_convert_value(global_capture_opts.file_duration);
+ value = time_unit_combo_box_convert_value(global_capture_opts.file_duration);
gtk_adjustment_set_value(file_duration_adj, (gfloat) value);
row++;
gtk_table_attach_defaults(GTK_TABLE(multi_tb), ringbuffer_nbf_sb, 1, 2, row, row+1);
ringbuffer_nbf_lb = gtk_label_new("files");
- gtk_misc_set_alignment(GTK_MISC(ringbuffer_nbf_lb), 0, 0.5);
+ gtk_misc_set_alignment(GTK_MISC(ringbuffer_nbf_lb), 0, 0.5f);
gtk_table_attach_defaults(GTK_TABLE(multi_tb), ringbuffer_nbf_lb, 2, 3, row, row+1);
row++;
gtk_table_attach_defaults(GTK_TABLE(multi_tb), stop_files_sb, 1, 2, row, row+1);
stop_files_lb = gtk_label_new("file(s)");
- gtk_misc_set_alignment(GTK_MISC(stop_files_lb), 0, 0.5);
+ gtk_misc_set_alignment(GTK_MISC(stop_files_lb), 0, 0.5f);
gtk_table_attach_defaults(GTK_TABLE(multi_tb), stop_files_lb, 2, 3, row, row+1);
row++;
gtk_table_attach_defaults(GTK_TABLE(limit_tb), stop_packets_sb, 1, 2, row, row+1);
stop_packets_lb = gtk_label_new("packet(s)");
- gtk_misc_set_alignment(GTK_MISC(stop_packets_lb), 0, 0.5);
+ gtk_misc_set_alignment(GTK_MISC(stop_packets_lb), 0, 0.5f);
gtk_table_attach_defaults(GTK_TABLE(limit_tb), stop_packets_lb, 2, 3, row, row+1);
row++;
gtk_widget_set_size_request(stop_filesize_sb, 80, -1);
gtk_table_attach_defaults(GTK_TABLE(limit_tb), stop_filesize_sb, 1, 2, row, row+1);
- stop_filesize_om = size_unit_option_menu_new(global_capture_opts.autostop_filesize);
- gtk_table_attach_defaults(GTK_TABLE(limit_tb), stop_filesize_om, 2, 3, row, row+1);
+ stop_filesize_cbx = size_unit_combo_box_new(global_capture_opts.autostop_filesize);
+ gtk_table_attach_defaults(GTK_TABLE(limit_tb), stop_filesize_cbx, 2, 3, row, row+1);
- value = size_unit_option_menu_set_value(global_capture_opts.autostop_filesize);
+ value = size_unit_combo_box_set_value(global_capture_opts.autostop_filesize);
gtk_adjustment_set_value(stop_filesize_adj, (gfloat) value);
row++;
gtk_widget_set_size_request(stop_duration_sb, 80, -1);
gtk_table_attach_defaults(GTK_TABLE(limit_tb), stop_duration_sb, 1, 2, row, row+1);
- stop_duration_om = time_unit_option_menu_new(global_capture_opts.autostop_duration);
- gtk_table_attach_defaults(GTK_TABLE(limit_tb), stop_duration_om, 2, 3, row, row+1);
+ stop_duration_cbx = time_unit_combo_box_new(global_capture_opts.autostop_duration);
+ gtk_table_attach_defaults(GTK_TABLE(limit_tb), stop_duration_cbx, 2, 3, row, row+1);
- value = time_unit_option_menu_convert_value(global_capture_opts.autostop_duration);
+ value = time_unit_combo_box_convert_value(global_capture_opts.autostop_duration);
gtk_adjustment_set_value(stop_duration_adj, (gfloat) value);
row++;
cancel_bt = g_object_get_data(G_OBJECT(bbox), GTK_STOCK_CANCEL);
gtk_tooltips_set_tip(tooltips, cancel_bt,
"Cancel and exit dialog.", NULL);
- window_set_cancel_button(cap_open_w, cancel_bt, window_cancel_button_cb);
+ window_set_cancel_button(cap_open_w, cancel_bt, capture_cancel_cb);
help_bt = g_object_get_data(G_OBJECT(bbox), GTK_STOCK_HELP);
gtk_tooltips_set_tip(tooltips, help_bt,
/* Attach pointers to needed widgets to the capture prefs window/object */
g_object_set_data(G_OBJECT(cap_open_w), E_CAP_IFACE_KEY, if_cb);
#ifdef HAVE_PCAP_REMOTE
- g_object_set_data(G_OBJECT(cap_open_w), E_CAP_IFTYPE_OM_KEY, iftype_om);
g_object_set_data(G_OBJECT(cap_open_w), E_CAP_REMOTE_DIALOG_PTR_KEY, NULL);
#endif
g_object_set_data(G_OBJECT(cap_open_w), E_CAP_SNAP_CB_KEY, snap_cb);
g_object_set_data(G_OBJECT(cap_open_w), E_CAP_BUFFER_SIZE_SB_KEY, buffer_size_sb);
#endif
g_object_set_data(G_OBJECT(cap_open_w), E_CAP_PROMISC_KEY, promisc_cb);
+ g_object_set_data(G_OBJECT(cap_open_w), E_CAP_PCAP_NG_KEY, pcap_ng_cb);
g_object_set_data(G_OBJECT(cap_open_w), E_CAP_FILT_KEY, filter_te);
g_object_set_data(G_OBJECT(cap_open_w), E_CAP_FILE_TE_KEY, file_te);
g_object_set_data(G_OBJECT(cap_open_w), E_CAP_MULTI_FILES_ON_CB_KEY, multi_files_on_cb);
g_object_set_data(G_OBJECT(cap_open_w), E_CAP_RING_NBF_LB_KEY, ringbuffer_nbf_lb);
g_object_set_data(G_OBJECT(cap_open_w), E_CAP_RING_FILESIZE_CB_KEY, ring_filesize_cb);
g_object_set_data(G_OBJECT(cap_open_w), E_CAP_RING_FILESIZE_SB_KEY, ring_filesize_sb);
- g_object_set_data(G_OBJECT(cap_open_w), E_CAP_RING_FILESIZE_OM_KEY, ring_filesize_om);
+ g_object_set_data(G_OBJECT(cap_open_w), E_CAP_RING_FILESIZE_CBX_KEY, ring_filesize_cbx);
g_object_set_data(G_OBJECT(cap_open_w), E_CAP_FILE_DURATION_CB_KEY, file_duration_cb);
g_object_set_data(G_OBJECT(cap_open_w), E_CAP_FILE_DURATION_SB_KEY, file_duration_sb);
- g_object_set_data(G_OBJECT(cap_open_w), E_CAP_FILE_DURATION_OM_KEY, file_duration_om);
+ g_object_set_data(G_OBJECT(cap_open_w), E_CAP_FILE_DURATION_CBX_KEY, file_duration_cbx);
g_object_set_data(G_OBJECT(cap_open_w), E_CAP_SYNC_KEY, sync_cb);
g_object_set_data(G_OBJECT(cap_open_w), E_CAP_AUTO_SCROLL_KEY, auto_scroll_cb);
g_object_set_data(G_OBJECT(cap_open_w), E_CAP_HIDE_INFO_KEY, hide_info_cb);
g_object_set_data(G_OBJECT(cap_open_w), E_CAP_STOP_PACKETS_LB_KEY, stop_packets_lb);
g_object_set_data(G_OBJECT(cap_open_w), E_CAP_STOP_FILESIZE_CB_KEY, stop_filesize_cb);
g_object_set_data(G_OBJECT(cap_open_w), E_CAP_STOP_FILESIZE_SB_KEY, stop_filesize_sb);
- g_object_set_data(G_OBJECT(cap_open_w), E_CAP_STOP_FILESIZE_OM_KEY, stop_filesize_om);
+ g_object_set_data(G_OBJECT(cap_open_w), E_CAP_STOP_FILESIZE_CBX_KEY, stop_filesize_cbx);
g_object_set_data(G_OBJECT(cap_open_w), E_CAP_STOP_DURATION_CB_KEY, stop_duration_cb);
g_object_set_data(G_OBJECT(cap_open_w), E_CAP_STOP_DURATION_SB_KEY, stop_duration_sb);
- g_object_set_data(G_OBJECT(cap_open_w), E_CAP_STOP_DURATION_OM_KEY, stop_duration_om);
+ g_object_set_data(G_OBJECT(cap_open_w), E_CAP_STOP_DURATION_CBX_KEY, stop_duration_cbx);
g_object_set_data(G_OBJECT(cap_open_w), E_CAP_STOP_FILES_CB_KEY, stop_files_cb);
g_object_set_data(G_OBJECT(cap_open_w), E_CAP_STOP_FILES_SB_KEY, stop_files_sb);
g_object_set_data(G_OBJECT(cap_open_w), E_CAP_STOP_FILES_LB_KEY, stop_files_lb);
}
}
+static void
+capture_cancel_cb(GtkWidget *win, gpointer data)
+{
+#ifdef HAVE_PCAP_REMOTE
+ if (g_hash_table_size (remote_host_list) == 0) {
+ /* Ensure we fall back to local interfaces */
+ global_capture_opts.src_type = CAPTURE_IFLOCAL;
+
+ if (global_capture_opts.iface) {
+ g_free (global_capture_opts.iface);
+ global_capture_opts.iface = NULL;
+ }
+ if (global_capture_opts.iface_descr) {
+ g_free (global_capture_opts.iface_descr);
+ global_capture_opts.iface_descr = NULL;
+ }
+ }
+#endif
+
+ window_cancel_button_cb (win, data);
+}
+
/* user selected a link type, convert to internal value */
static void
select_link_type_cb(GtkWidget *w, gpointer data)
}
#ifdef HAVE_PCAP_REMOTE
+static gboolean
+free_remote_host (gpointer key _U_, gpointer value, gpointer user _U_)
+{
+ struct remote_host *rh = value;
+
+ g_free (rh->remote_host);
+ g_free (rh->remote_port);
+ g_free (rh->auth_username);
+ g_free (rh->auth_password);
+
+ return TRUE;
+}
+
/* user selected an interface type (local/remote), convert to internal value) */
static void
-select_if_type_cb(GtkWidget *w, gpointer data)
+select_if_type_cb(GtkComboBox *iftype_cbx, gpointer data _U_)
{
- int new_iftype = GPOINTER_TO_INT(data);
- GtkWidget *iftype_om = g_object_get_data(G_OBJECT(w), E_CAP_IFTYPE_OM_KEY);
- int old_iftype = GPOINTER_TO_INT(g_object_get_data(G_OBJECT(iftype_om),
- E_CAP_OM_IFTYPE_VALUE_KEY));
-
- if (old_iftype != new_iftype)
- {
- g_object_set_data(G_OBJECT(iftype_om), E_CAP_OM_IFTYPE_VALUE_KEY,
- GINT_TO_POINTER(new_iftype));
- }
- if (new_iftype == CAPTURE_IFREMOTE)
- {
- capture_remote_cb(iftype_om, NULL);
+ int new_iftype = gtk_combo_box_get_active(GTK_COMBO_BOX(iftype_cbx));
+ int old_iftype = GPOINTER_TO_INT(g_object_get_data(G_OBJECT(iftype_cbx),
+ E_CAP_CBX_IFTYPE_VALUE_KEY));
+ int no_update = GPOINTER_TO_INT(g_object_get_data(G_OBJECT(iftype_cbx),
+ E_CAP_CBX_IFTYPE_NOUPDATE_KEY));
+ gint num_remote = g_hash_table_size (remote_host_list);
+
+ if (new_iftype == CAPTURE_IFREMOTE) {
+ g_object_set_data(G_OBJECT(iftype_cbx), E_CAP_CBX_PREV_IFTYPE_VALUE_KEY,
+ GINT_TO_POINTER(old_iftype));
+ capture_remote_cb(GTK_WIDGET(iftype_cbx), FALSE);
+ } else if (new_iftype != old_iftype) {
+ if (new_iftype > CAPTURE_IFREMOTE) {
+#if GTK_CHECK_VERSION(2,6,0)
+ if (new_iftype == num_remote + 4)
+#else
+ if (new_iftype == num_remote + 2)
+#endif
+ {
+ /* The user selected the "Clear list" entry */
+ new_iftype = CAPTURE_IFLOCAL;
+ gtk_combo_box_set_active(GTK_COMBO_BOX(iftype_cbx), new_iftype);
+ g_hash_table_foreach_remove (remote_host_list, free_remote_host, NULL);
+ num_remote += 3;
+ while (num_remote--) /* Remove separator lines and "Clear" item */
+ gtk_combo_box_remove_text (iftype_cbx, 2);
+ } else {
+ struct remote_host *rh;
+ gchar *string;
+#if GTK_CHECK_VERSION(2,6,0)
+ string = gtk_combo_box_get_active_text (GTK_COMBO_BOX(iftype_cbx));
+#else
+ GtkTreeModel *model;
+ GtkTreeIter iter;
+
+ model = gtk_combo_box_get_model(GTK_COMBO_BOX(iftype_cbx));
+ gtk_combo_box_get_active_iter(GTK_COMBO_BOX(iftype_cbx), &iter);
+ gtk_tree_model_get(model, &iter, 0, &string, -1);
+#endif
+ rh = g_hash_table_lookup (remote_host_list, string);
+ g_free (string);
+
+ g_free(global_capture_opts.remote_host);
+ global_capture_opts.remote_host = g_strdup(rh->remote_host);
+ g_free(global_capture_opts.remote_port);
+ global_capture_opts.remote_port = g_strdup(rh->remote_port);
+ global_capture_opts.auth_type = rh->auth_type;
+ if (global_capture_opts.auth_type == CAPTURE_AUTH_PWD && strlen(rh->auth_username) == 0) {
+ /* Empty username, ask for one */
+ capture_remote_cb(GTK_WIDGET(iftype_cbx), TRUE);
+ no_update = TRUE;
+ } else {
+ /* Already entered username and password */
+ g_free(global_capture_opts.auth_username);
+ global_capture_opts.auth_username = g_strdup(rh->auth_username);
+ g_free(global_capture_opts.auth_password);
+ global_capture_opts.auth_password = g_strdup(rh->auth_password);
+ }
+ }
}
- else if (new_iftype != old_iftype)
- {
- global_capture_opts.src_type = CAPTURE_IFLOCAL;
- update_interface_list();
+ if (!no_update) {
+ g_object_set_data(G_OBJECT(iftype_cbx), E_CAP_CBX_PREV_IFTYPE_VALUE_KEY,
+ GINT_TO_POINTER(old_iftype));
+ g_object_set_data(G_OBJECT(iftype_cbx), E_CAP_CBX_IFTYPE_VALUE_KEY,
+ GINT_TO_POINTER(new_iftype));
+ update_interface_list();
}
+ }
}
#endif
/* convert dialog settings into capture_opts values */
static gboolean
capture_dlg_prep(gpointer parent_w) {
- GtkWidget *if_cb, *snap_cb, *snap_sb, *promisc_cb, *filter_te, *filter_cm,
+ GtkWidget *if_cb, *snap_cb, *snap_sb, *promisc_cb, *pcap_ng_cb, *filter_te, *filter_cm,
*file_te, *multi_files_on_cb, *ringbuffer_nbf_sb, *ringbuffer_nbf_cb,
*linktype_om, *sync_cb, *auto_scroll_cb, *hide_info_cb,
*stop_packets_cb, *stop_packets_sb,
- *stop_filesize_cb, *stop_filesize_sb, *stop_filesize_om,
- *stop_duration_cb, *stop_duration_sb, *stop_duration_om,
- *ring_filesize_cb, *ring_filesize_sb, *ring_filesize_om,
- *file_duration_cb, *file_duration_sb, *file_duration_om,
+ *stop_filesize_cb, *stop_filesize_sb, *stop_filesize_cbx,
+ *stop_duration_cb, *stop_duration_sb, *stop_duration_cbx,
+ *ring_filesize_cb, *ring_filesize_sb, *ring_filesize_cbx,
+ *file_duration_cb, *file_duration_sb, *file_duration_cbx,
*stop_files_cb, *stop_files_sb,
*m_resolv_cb, *n_resolv_cb, *t_resolv_cb;
#ifdef HAVE_PCAP_REMOTE
- GtkWidget *iftype_om;
+ GtkWidget *iftype_cbx;
#endif
#ifdef _WIN32
GtkWidget *buffer_size_sb;
gchar *dirname;
gint32 tmp;
- if_cb = (GtkWidget *) g_object_get_data(G_OBJECT(parent_w), E_CAP_IFACE_KEY);
+ if_cb = (GtkWidget *) g_object_get_data(G_OBJECT(parent_w), E_CAP_IFACE_KEY);
#ifdef HAVE_PCAP_REMOTE
- iftype_om = (GtkWidget *) g_object_get_data(G_OBJECT(parent_w), E_CAP_IFTYPE_OM_KEY);
+ iftype_cbx = (GtkWidget *) g_object_get_data(G_OBJECT(parent_w), E_CAP_IFTYPE_CBX_KEY);
#endif
- snap_cb = (GtkWidget *) g_object_get_data(G_OBJECT(parent_w), E_CAP_SNAP_CB_KEY);
- snap_sb = (GtkWidget *) g_object_get_data(G_OBJECT(parent_w), E_CAP_SNAP_SB_KEY);
- linktype_om = (GtkWidget *) g_object_get_data(G_OBJECT(parent_w), E_CAP_LT_OM_KEY);
+ snap_cb = (GtkWidget *) g_object_get_data(G_OBJECT(parent_w), E_CAP_SNAP_CB_KEY);
+ snap_sb = (GtkWidget *) g_object_get_data(G_OBJECT(parent_w), E_CAP_SNAP_SB_KEY);
+ linktype_om = (GtkWidget *) g_object_get_data(G_OBJECT(parent_w), E_CAP_LT_OM_KEY);
#ifdef _WIN32
buffer_size_sb = (GtkWidget *) g_object_get_data(G_OBJECT(parent_w), E_CAP_BUFFER_SIZE_SB_KEY);
#endif
promisc_cb = (GtkWidget *) g_object_get_data(G_OBJECT(parent_w), E_CAP_PROMISC_KEY);
- filter_cm = g_object_get_data(G_OBJECT(top_level), E_CFILTER_CM_KEY);
- filter_te = GTK_COMBO(filter_cm)->entry;
- file_te = (GtkWidget *) g_object_get_data(G_OBJECT(parent_w), E_CAP_FILE_TE_KEY);
+ pcap_ng_cb = (GtkWidget *) g_object_get_data(G_OBJECT(parent_w), E_CAP_PCAP_NG_KEY);
+ filter_cm = g_object_get_data(G_OBJECT(top_level), E_CFILTER_CM_KEY);
+ filter_te = GTK_COMBO(filter_cm)->entry;
+ file_te = (GtkWidget *) g_object_get_data(G_OBJECT(parent_w), E_CAP_FILE_TE_KEY);
multi_files_on_cb = (GtkWidget *) g_object_get_data(G_OBJECT(parent_w), E_CAP_MULTI_FILES_ON_CB_KEY);
ringbuffer_nbf_cb = (GtkWidget *) g_object_get_data(G_OBJECT(parent_w), E_CAP_RING_NBF_CB_KEY);
ringbuffer_nbf_sb = (GtkWidget *) g_object_get_data(G_OBJECT(parent_w), E_CAP_RING_NBF_SB_KEY);
- ring_filesize_cb = (GtkWidget *) g_object_get_data(G_OBJECT(parent_w), E_CAP_RING_FILESIZE_CB_KEY);
- ring_filesize_sb = (GtkWidget *) g_object_get_data(G_OBJECT(parent_w), E_CAP_RING_FILESIZE_SB_KEY);
- ring_filesize_om = (GtkWidget *) g_object_get_data(G_OBJECT(parent_w), E_CAP_RING_FILESIZE_OM_KEY);
- file_duration_cb = (GtkWidget *) g_object_get_data(G_OBJECT(parent_w), E_CAP_FILE_DURATION_CB_KEY);
- file_duration_sb = (GtkWidget *) g_object_get_data(G_OBJECT(parent_w), E_CAP_FILE_DURATION_SB_KEY);
- file_duration_om = (GtkWidget *) g_object_get_data(G_OBJECT(parent_w), E_CAP_FILE_DURATION_OM_KEY);
+ ring_filesize_cb = (GtkWidget *) g_object_get_data(G_OBJECT(parent_w), E_CAP_RING_FILESIZE_CB_KEY);
+ ring_filesize_sb = (GtkWidget *) g_object_get_data(G_OBJECT(parent_w), E_CAP_RING_FILESIZE_SB_KEY);
+ ring_filesize_cbx = (GtkWidget *) g_object_get_data(G_OBJECT(parent_w), E_CAP_RING_FILESIZE_CBX_KEY);
+ file_duration_cb = (GtkWidget *) g_object_get_data(G_OBJECT(parent_w), E_CAP_FILE_DURATION_CB_KEY);
+ file_duration_sb = (GtkWidget *) g_object_get_data(G_OBJECT(parent_w), E_CAP_FILE_DURATION_SB_KEY);
+ file_duration_cbx = (GtkWidget *) g_object_get_data(G_OBJECT(parent_w), E_CAP_FILE_DURATION_CBX_KEY);
sync_cb = (GtkWidget *) g_object_get_data(G_OBJECT(parent_w), E_CAP_SYNC_KEY);
auto_scroll_cb = (GtkWidget *) g_object_get_data(G_OBJECT(parent_w), E_CAP_AUTO_SCROLL_KEY);
hide_info_cb = (GtkWidget *) g_object_get_data(G_OBJECT(parent_w), E_CAP_HIDE_INFO_KEY);
- stop_packets_cb = (GtkWidget *) g_object_get_data(G_OBJECT(parent_w), E_CAP_STOP_PACKETS_CB_KEY);
- stop_packets_sb = (GtkWidget *) g_object_get_data(G_OBJECT(parent_w), E_CAP_STOP_PACKETS_SB_KEY);
- stop_filesize_cb = (GtkWidget *) g_object_get_data(G_OBJECT(parent_w), E_CAP_STOP_FILESIZE_CB_KEY);
- stop_filesize_sb = (GtkWidget *) g_object_get_data(G_OBJECT(parent_w), E_CAP_STOP_FILESIZE_SB_KEY);
- stop_filesize_om = (GtkWidget *) g_object_get_data(G_OBJECT(parent_w), E_CAP_STOP_FILESIZE_OM_KEY);
- stop_duration_cb = (GtkWidget *) g_object_get_data(G_OBJECT(parent_w), E_CAP_STOP_DURATION_CB_KEY);
- stop_duration_sb = (GtkWidget *) g_object_get_data(G_OBJECT(parent_w), E_CAP_STOP_DURATION_SB_KEY);
- stop_duration_om = (GtkWidget *) g_object_get_data(G_OBJECT(parent_w), E_CAP_STOP_DURATION_OM_KEY);
+ stop_packets_cb = (GtkWidget *) g_object_get_data(G_OBJECT(parent_w), E_CAP_STOP_PACKETS_CB_KEY);
+ stop_packets_sb = (GtkWidget *) g_object_get_data(G_OBJECT(parent_w), E_CAP_STOP_PACKETS_SB_KEY);
+ stop_filesize_cb = (GtkWidget *) g_object_get_data(G_OBJECT(parent_w), E_CAP_STOP_FILESIZE_CB_KEY);
+ stop_filesize_sb = (GtkWidget *) g_object_get_data(G_OBJECT(parent_w), E_CAP_STOP_FILESIZE_SB_KEY);
+ stop_filesize_cbx = (GtkWidget *) g_object_get_data(G_OBJECT(parent_w), E_CAP_STOP_FILESIZE_CBX_KEY);
+ stop_duration_cb = (GtkWidget *) g_object_get_data(G_OBJECT(parent_w), E_CAP_STOP_DURATION_CB_KEY);
+ stop_duration_sb = (GtkWidget *) g_object_get_data(G_OBJECT(parent_w), E_CAP_STOP_DURATION_SB_KEY);
+ stop_duration_cbx = (GtkWidget *) g_object_get_data(G_OBJECT(parent_w), E_CAP_STOP_DURATION_CBX_KEY);
stop_files_cb = (GtkWidget *) g_object_get_data(G_OBJECT(parent_w), E_CAP_STOP_FILES_CB_KEY);
stop_files_sb = (GtkWidget *) g_object_get_data(G_OBJECT(parent_w), E_CAP_STOP_FILES_SB_KEY);
m_resolv_cb = (GtkWidget *) g_object_get_data(G_OBJECT(parent_w), E_CAP_M_RESOLVE_KEY);
g_free(entry_text);
return FALSE;
}
- if (global_capture_opts.iface)
- g_free(global_capture_opts.iface);
- if (global_capture_opts.iface_descr)
- g_free(global_capture_opts.iface_descr);
+ g_free(global_capture_opts.iface);
+ g_free(global_capture_opts.iface_descr);
global_capture_opts.iface = g_strdup(if_name);
global_capture_opts.iface_descr = get_interface_descriptive_name(global_capture_opts.iface);
g_free(entry_text);
#ifdef HAVE_PCAP_REMOTE
global_capture_opts.src_type = (capture_source)
- GPOINTER_TO_INT(g_object_get_data(G_OBJECT(iftype_om), E_CAP_OM_IFTYPE_VALUE_KEY));
+ GPOINTER_TO_INT(g_object_get_data(G_OBJECT(iftype_cbx), E_CAP_CBX_IFTYPE_VALUE_KEY));
+ if (global_capture_opts.src_type > CAPTURE_IFREMOTE)
+ global_capture_opts.src_type = CAPTURE_IFREMOTE;
#endif
#ifdef _WIN32
global_capture_opts.promisc_mode =
gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(promisc_cb));
+ global_capture_opts.use_pcapng =
+ gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(pcap_ng_cb));
/* XXX - don't try to get clever and set "cfile.filter" to NULL if the
filter string is empty, as an indication that we don't have a filter
global_capture_opts.autostop_duration =
gtk_spin_button_get_value_as_int(GTK_SPIN_BUTTON(stop_duration_sb));
global_capture_opts.autostop_duration =
- time_unit_option_menu_get_value(stop_duration_om, global_capture_opts.autostop_duration);
+ time_unit_combo_box_get_value(stop_duration_cbx, global_capture_opts.autostop_duration);
}
global_capture_opts.real_time_mode =
global_capture_opts.file_duration =
gtk_spin_button_get_value_as_int(GTK_SPIN_BUTTON(file_duration_sb));
global_capture_opts.file_duration =
- time_unit_option_menu_get_value(file_duration_om, global_capture_opts.file_duration);
+ time_unit_combo_box_get_value(file_duration_cbx, global_capture_opts.file_duration);
}
global_capture_opts.has_autostop_files =
gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(ring_filesize_cb));
if (global_capture_opts.has_autostop_filesize) {
tmp = gtk_spin_button_get_value_as_int(GTK_SPIN_BUTTON(ring_filesize_sb));
- tmp = size_unit_option_menu_convert_value(ring_filesize_om, tmp);
+ tmp = size_unit_combo_box_convert_value(ring_filesize_cbx, tmp);
if(tmp != 0) {
global_capture_opts.autostop_filesize = tmp;
} else {
gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(stop_filesize_cb));
if (global_capture_opts.has_autostop_filesize) {
tmp = gtk_spin_button_get_value_as_int(GTK_SPIN_BUTTON(stop_filesize_sb));
- tmp = size_unit_option_menu_convert_value(stop_filesize_om, tmp);
+ tmp = size_unit_combo_box_convert_value(stop_filesize_cbx, tmp);
if(tmp != 0) {
global_capture_opts.autostop_filesize = tmp;
} else {
{
GtkWidget *fs;
#ifdef HAVE_PCAP_REMOTE
+ GList *if_list;
GtkWidget *remote_w;
#endif
Capture Options dialog? */
fs = g_object_get_data(G_OBJECT(win), E_FILE_SEL_DIALOG_PTR_KEY);
+#ifdef HAVE_PCAP_REMOTE
+ if_list = (GList *) g_object_get_data(G_OBJECT(win), E_CAP_IF_LIST_KEY);
+ if (if_list) {
+ free_interface_list(if_list);
+ }
+#endif
+
if (fs != NULL) {
/* Yes. Destroy it. */
window_destroy(fs);
GtkWidget *if_cb,
*snap_cb, *snap_sb,
*multi_files_on_cb, *ringbuffer_nbf_cb, *ringbuffer_nbf_sb, *ringbuffer_nbf_lb,
- *ring_filesize_cb, *ring_filesize_sb, *ring_filesize_om,
- *file_duration_cb, *file_duration_sb, *file_duration_om,
+ *ring_filesize_cb, *ring_filesize_sb, *ring_filesize_cbx,
+ *file_duration_cb, *file_duration_sb, *file_duration_cbx,
*sync_cb, *auto_scroll_cb, *hide_info_cb,
*stop_packets_cb, *stop_packets_sb, *stop_packets_lb,
- *stop_filesize_cb, *stop_filesize_sb, *stop_filesize_om,
- *stop_duration_cb, *stop_duration_sb, *stop_duration_om,
+ *stop_filesize_cb, *stop_filesize_sb, *stop_filesize_cbx,
+ *stop_duration_cb, *stop_duration_sb, *stop_duration_cbx,
*stop_files_cb, *stop_files_sb, *stop_files_lb;
if_cb = (GtkWidget *) g_object_get_data(G_OBJECT(parent_w), E_CAP_IFACE_KEY);
snap_cb = (GtkWidget *) g_object_get_data(G_OBJECT(parent_w), E_CAP_SNAP_CB_KEY);
snap_sb = (GtkWidget *) g_object_get_data(G_OBJECT(parent_w), E_CAP_SNAP_SB_KEY);
- multi_files_on_cb = (GtkWidget *) g_object_get_data(G_OBJECT(parent_w), E_CAP_MULTI_FILES_ON_CB_KEY);
+ multi_files_on_cb = (GtkWidget *) g_object_get_data(G_OBJECT(parent_w), E_CAP_MULTI_FILES_ON_CB_KEY);
ringbuffer_nbf_cb = (GtkWidget *) g_object_get_data(G_OBJECT(parent_w), E_CAP_RING_NBF_CB_KEY);
ringbuffer_nbf_sb = (GtkWidget *) g_object_get_data(G_OBJECT(parent_w), E_CAP_RING_NBF_SB_KEY);
ringbuffer_nbf_lb = (GtkWidget *) g_object_get_data(G_OBJECT(parent_w), E_CAP_RING_NBF_LB_KEY);
- ring_filesize_cb = (GtkWidget *) g_object_get_data(G_OBJECT(parent_w), E_CAP_RING_FILESIZE_CB_KEY);
- ring_filesize_sb = (GtkWidget *) g_object_get_data(G_OBJECT(parent_w), E_CAP_RING_FILESIZE_SB_KEY);
- ring_filesize_om = (GtkWidget *) g_object_get_data(G_OBJECT(parent_w), E_CAP_RING_FILESIZE_OM_KEY);
- file_duration_cb = (GtkWidget *) g_object_get_data(G_OBJECT(parent_w), E_CAP_FILE_DURATION_CB_KEY);
- file_duration_sb = (GtkWidget *) g_object_get_data(G_OBJECT(parent_w), E_CAP_FILE_DURATION_SB_KEY);
- file_duration_om = (GtkWidget *) g_object_get_data(G_OBJECT(parent_w), E_CAP_FILE_DURATION_OM_KEY);
+ ring_filesize_cb = (GtkWidget *) g_object_get_data(G_OBJECT(parent_w), E_CAP_RING_FILESIZE_CB_KEY);
+ ring_filesize_sb = (GtkWidget *) g_object_get_data(G_OBJECT(parent_w), E_CAP_RING_FILESIZE_SB_KEY);
+ ring_filesize_cbx = (GtkWidget *) g_object_get_data(G_OBJECT(parent_w), E_CAP_RING_FILESIZE_CBX_KEY);
+ file_duration_cb = (GtkWidget *) g_object_get_data(G_OBJECT(parent_w), E_CAP_FILE_DURATION_CB_KEY);
+ file_duration_sb = (GtkWidget *) g_object_get_data(G_OBJECT(parent_w), E_CAP_FILE_DURATION_SB_KEY);
+ file_duration_cbx = (GtkWidget *) g_object_get_data(G_OBJECT(parent_w), E_CAP_FILE_DURATION_CBX_KEY);
sync_cb = (GtkWidget *) g_object_get_data(G_OBJECT(parent_w), E_CAP_SYNC_KEY);
auto_scroll_cb = (GtkWidget *) g_object_get_data(G_OBJECT(parent_w), E_CAP_AUTO_SCROLL_KEY);
hide_info_cb = (GtkWidget *) g_object_get_data(G_OBJECT(parent_w), E_CAP_HIDE_INFO_KEY);
stop_packets_cb = (GtkWidget *) g_object_get_data(G_OBJECT(parent_w), E_CAP_STOP_PACKETS_CB_KEY);
stop_packets_sb = (GtkWidget *) g_object_get_data(G_OBJECT(parent_w), E_CAP_STOP_PACKETS_SB_KEY);
stop_packets_lb = (GtkWidget *) g_object_get_data(G_OBJECT(parent_w), E_CAP_STOP_PACKETS_LB_KEY);
- stop_filesize_cb = (GtkWidget *) g_object_get_data(G_OBJECT(parent_w), E_CAP_STOP_FILESIZE_CB_KEY);
- stop_filesize_sb = (GtkWidget *) g_object_get_data(G_OBJECT(parent_w), E_CAP_STOP_FILESIZE_SB_KEY);
- stop_filesize_om = (GtkWidget *) g_object_get_data(G_OBJECT(parent_w), E_CAP_STOP_FILESIZE_OM_KEY);
- stop_duration_cb = (GtkWidget *) g_object_get_data(G_OBJECT(parent_w), E_CAP_STOP_DURATION_CB_KEY);
- stop_duration_sb = (GtkWidget *) g_object_get_data(G_OBJECT(parent_w), E_CAP_STOP_DURATION_SB_KEY);
- stop_duration_om = (GtkWidget *) g_object_get_data(G_OBJECT(parent_w), E_CAP_STOP_DURATION_OM_KEY);
+ stop_filesize_cb = (GtkWidget *) g_object_get_data(G_OBJECT(parent_w), E_CAP_STOP_FILESIZE_CB_KEY);
+ stop_filesize_sb = (GtkWidget *) g_object_get_data(G_OBJECT(parent_w), E_CAP_STOP_FILESIZE_SB_KEY);
+ stop_filesize_cbx = (GtkWidget *) g_object_get_data(G_OBJECT(parent_w), E_CAP_STOP_FILESIZE_CBX_KEY);
+ stop_duration_cb = (GtkWidget *) g_object_get_data(G_OBJECT(parent_w), E_CAP_STOP_DURATION_CB_KEY);
+ stop_duration_sb = (GtkWidget *) g_object_get_data(G_OBJECT(parent_w), E_CAP_STOP_DURATION_SB_KEY);
+ stop_duration_cbx = (GtkWidget *) g_object_get_data(G_OBJECT(parent_w), E_CAP_STOP_DURATION_CBX_KEY);
stop_files_cb = (GtkWidget *) g_object_get_data(G_OBJECT(parent_w), E_CAP_STOP_FILES_CB_KEY);
stop_files_sb = (GtkWidget *) g_object_get_data(G_OBJECT(parent_w), E_CAP_STOP_FILES_SB_KEY);
stop_files_lb = (GtkWidget *) g_object_get_data(G_OBJECT(parent_w), E_CAP_STOP_FILES_LB_KEY);
gtk_widget_set_sensitive(GTK_WIDGET(ring_filesize_cb), TRUE);
gtk_widget_set_sensitive(GTK_WIDGET(ring_filesize_sb),
gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(ring_filesize_cb)));
- gtk_widget_set_sensitive(GTK_WIDGET(ring_filesize_om),
+ gtk_widget_set_sensitive(GTK_WIDGET(ring_filesize_cbx),
gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(ring_filesize_cb)));
/* The ring duration spinbox is sensitive if the "Next capture file
gtk_widget_set_sensitive(GTK_WIDGET(file_duration_cb), TRUE);
gtk_widget_set_sensitive(GTK_WIDGET(file_duration_sb),
gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(file_duration_cb)));
- gtk_widget_set_sensitive(GTK_WIDGET(file_duration_om),
+ gtk_widget_set_sensitive(GTK_WIDGET(file_duration_cbx),
gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(file_duration_cb)));
gtk_widget_set_sensitive(GTK_WIDGET(stop_filesize_cb), FALSE);
gtk_widget_set_sensitive(GTK_WIDGET(stop_filesize_sb), FALSE);
- gtk_widget_set_sensitive(GTK_WIDGET(stop_filesize_om), FALSE);
+ gtk_widget_set_sensitive(GTK_WIDGET(stop_filesize_cbx), FALSE);
gtk_widget_set_sensitive(GTK_WIDGET(stop_files_cb), TRUE);
gtk_widget_set_sensitive(GTK_WIDGET(stop_files_sb),
gtk_widget_set_sensitive(GTK_WIDGET(ring_filesize_cb), FALSE);
gtk_widget_set_sensitive(GTK_WIDGET(ring_filesize_sb),FALSE);
- gtk_widget_set_sensitive(GTK_WIDGET(ring_filesize_om),FALSE);
+ gtk_widget_set_sensitive(GTK_WIDGET(ring_filesize_cbx),FALSE);
gtk_widget_set_sensitive(GTK_WIDGET(file_duration_cb), FALSE);
gtk_widget_set_sensitive(GTK_WIDGET(file_duration_sb),FALSE);
- gtk_widget_set_sensitive(GTK_WIDGET(file_duration_om),FALSE);
+ gtk_widget_set_sensitive(GTK_WIDGET(file_duration_cbx),FALSE);
/* The maximum file size spinbox is sensitive if the "Stop capture
after N kilobytes" checkbox is on. */
gtk_widget_set_sensitive(GTK_WIDGET(stop_filesize_cb), TRUE);
gtk_widget_set_sensitive(GTK_WIDGET(stop_filesize_sb),
gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(stop_filesize_cb)));
- gtk_widget_set_sensitive(GTK_WIDGET(stop_filesize_om),
+ gtk_widget_set_sensitive(GTK_WIDGET(stop_filesize_cbx),
gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(stop_filesize_cb)));
gtk_widget_set_sensitive(GTK_WIDGET(stop_files_cb), FALSE);
after N seconds" checkbox is on. */
gtk_widget_set_sensitive(GTK_WIDGET(stop_duration_sb),
gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(stop_duration_cb)));
- gtk_widget_set_sensitive(GTK_WIDGET(stop_duration_om),
+ gtk_widget_set_sensitive(GTK_WIDGET(stop_duration_cbx),
gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(stop_duration_cb)));
}
git.samba.org / obnox / wireshark / wip.git / blobdiff