Add support for:

  - The AirPcap Multi-Channel Aggregator (which is marketspeak for an "any" 
    device)
  - Merging the 802.11 dissector WEP key list with AirPcap's
  - Decrypting WEP in the adapter, in Wireshark, or not at all
  
Update the release notes.

svn path=/trunk/; revision=19599

1 files changed, 181 insertions, 12 deletions

diff --git a/gtk/airpcap_dlg.h b/gtk/airpcap_dlg.h
index 3e1ff0bf4f..870a5617bf 100644
--- a/gtk/airpcap_dlg.h
+++ b/gtk/airpcap_dlg.h
@@ -32,9 +32,23 @@
 #define AIRPCAP_ADVANCED_FROM_OPTIONS 1
 
 /*
- * Takes the keys from the GtkList widget, and add them to the interface list
+ * Returns FALSE if a text string has lenght 0, i.e. the first char 
+ * is '\0', TRUE otherwise
  */
-void airpcap_add_keys_from_list(GtkWidget *w, airpcap_if_info_t *if_info);
+gboolean
+string_is_not_empty(gchar *s);
+
+/*
+ * Edit key window destroy callback
+ */
+void
+on_edit_key_w_destroy(GtkWidget *button, gpointer data _U_);
+
+/*
+ * Add key window destroy callback
+ */
+void
+on_add_key_w_destroy(GtkWidget *button, gpointer data _U_);
 
 /*
  * Pop-up window, used to ask the user if he wants to save the selected interface settings
@@ -66,16 +80,104 @@ void
 airpcap_fill_if_combo(GtkWidget *combo, GList* if_list);
 
 /*
+ * Callback for the 'Add Key' button.
+ */
+void
+on_add_new_key_bt_clicked(GtkWidget *button, gpointer data _U_);
+
+/*
+ * Callback for the 'Remove Key' button.
+ */
+void
+on_remove_key_bt_clicked(GtkWidget *button, gpointer data _U_);
+
+/*
+ * Callback for the 'Edit Key' button.
+ */
+void
+on_edit_key_bt_clicked(GtkWidget *button, gpointer data _U_);
+
+/*
+ * Callback for the 'Move Key Down' button.
+ */
+void
+on_move_key_down_bt_clicked(GtkWidget *button, gpointer data _U_);
+
+/*
+ * Callback for the 'Move Key Up' button.
+ */
+void
+on_move_key_up_bt_clicked(GtkWidget *button, gpointer data _U_);
+
+/*
  * Add key window destroy callback
  */
 static void
 add_key_w_destroy_cb(GtkWidget *button, gpointer data _U_);
 
 /*
+ * Callback for the Wireless Advanced Settings 'Apply' button.
+ */
+void
+on_advanced_apply_bt_clicked(GtkWidget *button, gpointer data _U_);
+
+/*
+ * Callback for the OK button 'clicked' in the Advanced Wireless Settings window.
+ */
+void
+on_advanced_ok_bt_clicked(GtkWidget *button, gpointer data _U_);
+
+/*
+ * Callback for the CANCEL button 'clicked' in the Advanced Wireless Settings window.
+ */
+void
+on_advanced_cancel_bt_clicked(GtkWidget *button, gpointer data _U_);
+
+/*
+ * Callback for the 'Apply' button.
+ */
+void
+on_key_management_apply_bt_clicked(GtkWidget *button, gpointer data _U_);
+
+/*
+ * Callback for the OK button 'clicked' in the Decryption Key Management window.
+ */
+void
+on_key_management_ok_bt_clicked(GtkWidget *button, gpointer data _U_);
+
+/*
+ * Callback for the CANCEL button 'clicked' in the Decryption Key Management window.
+ */
+void
+on_key_management_cancel_bt_clicked(GtkWidget *button, gpointer data _U_);
+
+/* the window was closed, cleanup things */
+void
+on_key_management_destroy(GtkWidget *w _U_, gpointer data _U_);
+
+/*
+ * Callback for the 'Reset Configuration' button.
+ */
+void
+on_reset_configuration_bt_clicked(GtkWidget *button, gpointer data _U_);
+
+/* 
+ * Turns the decryption on or off
+ */
+void
+on_enable_decryption_en_changed(GtkWidget *w, gpointer data);
+
+/*
+ * Will fill the given combo box with the current decryption mode string
+ */
+void
+update_decryption_mode_cm(GtkWidget *w);
+
+/*
  * Changed callback for the channel combobox
  */
 static void
-channel_changed_cb(GtkWidget *w _U_, gpointer data);
+on_channel_en_changed(GtkWidget *w _U_, gpointer data);
 
 /*
  * Activate callback for the link layer combobox
@@ -90,10 +192,44 @@ static void
 link_layer_changed_cb(GtkWidget *w _U_, gpointer data);
 
 /*
- * Callback for the crc chackbox
+ * Callback for the frame check sequence checkbox
  */
 static void
-crc_check_cb(GtkWidget *w, gpointer user_data);
+on_fcs_ck_toggled(GtkWidget *w, gpointer user_data);
+
+/* 
+ * Reset configuration
+ */
+void
+on_reset_configuration_bt_clicked(GtkWidget *button, gpointer data _U_);
+
+/*
+ * Callback for the select row event in the key list widget
+ */
+void
+on_key_ls_select_row(GtkWidget *widget, 
+                     gint row,
+                     gint column,
+                     GdkEventButton *event,
+                     gpointer data);
+
+/*
+ * Callback for the unselect row event in the key list widget
+ */
+void
+on_key_ls_unselect_row(GtkWidget *widget, 
+                     gint row,
+                     gint column,
+                     GdkEventButton *event,
+                     gpointer data);
+
+/*
+ * Callback for the click column event in the key list widget
+ */
+void
+on_key_ls_click_column(GtkWidget *widget,
+                       gint column,
+                       gpointer data);
 
 /*
  * Callback for the wrong crc chackbox
@@ -120,12 +256,6 @@ static void
 combo_if_activate_cb(GtkWidget *w _U_, gpointer data);
 
 /*
- * Changed callback for the adapter combobox
- */
-static void
-airpcap_advanced_combo_if_changed_cb(GtkWidget *w _U_, gpointer data);
-
-/*
  * Pop-up window that appears when user confirms the "Save settings..." dialog
  */
 static void
@@ -139,7 +269,14 @@ void update_blink(gpointer data _U_);
 /*
  * Blink button callback
  */
-void blink_cb(GtkWidget *blink_bt _U_, gpointer if_data);
+void 
+on_blink_bt_clicked(GtkWidget *blink_bt _U_, gpointer if_data);
+
+/*
+ * Callback for the 'Any' adapter What's This button.
+ */
+void
+on_what_s_this_bt_clicked( GtkWidget *blink_bt _U_, gpointer if_data );
 
 /** Create a "Airpcap" dialog box caused by a button click.
  *
@@ -148,4 +285,36 @@ void blink_cb(GtkWidget *blink_bt _U_, gpointer if_data);
  */
 void display_airpcap_advanced_cb(GtkWidget *widget, gpointer construct_args_ptr);
 
+/* Called to create the key management window */
+void
+display_airpcap_key_management_cb(GtkWidget *w, gpointer data);
+
+/**/
+/*
+ * Dialog box that appears whenever keys are not consistent between wieshark and airpcap 
+ */
+void
+airpcap_keys_check_w(GtkWidget *w, gpointer data);
+
+void
+on_keys_check_w_destroy (GtkWidget *w, gpointer user_data);
+
+void
+on_keys_check_cancel_bt_clicked (GtkWidget *button, gpointer user_data);
+
+void
+on_keys_check_ok_bt_clicked (GtkWidget *button, gpointer user_data);
+
+void
+on_keep_bt_clicked (GtkWidget *button, gpointer user_data);
+
+void
+on_merge_bt_clicked (GtkWidget *button, gpointer user_data);
+
+void
+on_import_bt_clicked (GtkWidget *button, gpointer user_data);
+
+void
+on_ignore_bt_clicked (GtkWidget *button, gpointer user_data);
+
 #endif