From Giorgio Tino: Add support for version 2.0 of the AirPcap driver,
authorgerald <gerald@f5534014-38df-0310-8fa8-9805f1628bb7>
Mon, 30 Oct 2006 06:34:31 +0000 (06:34 +0000)
committergerald <gerald@f5534014-38df-0310-8fa8-9805f1628bb7>
Mon, 30 Oct 2006 06:34:31 +0000 (06:34 +0000)
which has an updated API for WEP key handling.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@19736 f5534014-38df-0310-8fa8-9805f1628bb7

airpcap.h
airpcap_loader.c
airpcap_loader.h
gtk/about_dlg.c
gtk/airpcap_dlg.c
gtk/airpcap_gui_utils.c
gtk/airpcap_gui_utils.h
gtk/main.c

index 39bdf2fa480850c798f0ef1b812cc8bdb874457c..d6df6ca1b07340403abe1e45bc6eb43bb6fe602f 100644 (file)
--- a/airpcap.h
+++ b/airpcap.h
@@ -159,7 +159,7 @@ AirpcapMacAddress, *PAirpcapMacAddress;
 
        KeysCollectionSize = sizeof(AirpcapKeysCollection) + NumKeys * sizeof(AirpcapKey);
 
-       KeysCollection = (PAirpcapKeysCollection)malloc(KeysCollectionSize);
+       KeysCollection = (PAirpcapKeysCollection)g_malloc(KeysCollectionSize);
        if(!KeysCollection)
        {
                // Error
index 3cadef4421f50e4e6d08a4d58a059e2537c0f1ec..70baa24f51d1a9fb38594f9681a9f0f233d28d32 100644 (file)
@@ -85,8 +85,12 @@ static AirpcapGetFcsValidationHandler g_PAirpcapGetFcsValidation;
 static AirpcapSetFcsValidationHandler g_PAirpcapSetFcsValidation;
 static AirpcapGetDeviceKeysHandler g_PAirpcapGetDeviceKeys;
 static AirpcapSetDeviceKeysHandler g_PAirpcapSetDeviceKeys;
+static AirpcapGetDriverKeysHandler g_PAirpcapGetDriverKeys;
+static AirpcapSetDriverKeysHandler g_PAirpcapSetDriverKeys;
 static AirpcapGetDecryptionStateHandler g_PAirpcapGetDecryptionState;
 static AirpcapSetDecryptionStateHandler g_PAirpcapSetDecryptionState;
+static AirpcapGetDriverDecryptionStateHandler g_PAirpcapGetDriverDecryptionState;
+static AirpcapSetDriverDecryptionStateHandler g_PAirpcapSetDriverDecryptionState;
 static AirpcapStoreCurConfigAsAdapterDefaultHandler g_PAirpcapStoreCurConfigAsAdapterDefault;
 static AirpcapGetVersionHandler g_PAirpcapGetVersion;
 
@@ -162,7 +166,7 @@ gboolean
 wep_key_is_valid(char* key)
 {
 GString *new_key_string;
-gint i=0;
+guint i=0;
 
 if(key == NULL)
        return FALSE;
@@ -288,6 +292,63 @@ g_free(user_data);
 return TRUE;
 }
 
+
+
+/*
+ * Function used to read the Decryption Keys from the preferences and store them
+ * properly into the airpcap adapter.
+ */
+BOOL
+load_wlan_driver_wep_keys()
+{
+keys_cb_data_t* user_data;
+guint i;
+gchar *tmp = NULL;
+
+/* Retrieve the wlan preferences */
+wlan_prefs = prefs_find_module("wlan");
+
+/* Allocate a structure used to keep infos  between the callbacks */
+user_data = (keys_cb_data_t*)g_malloc(sizeof(keys_cb_data_t));
+
+/* Fill the structure */
+user_data->list = NULL;
+user_data->current_index = 0;
+user_data->number_of_keys= 0; /* Still unknown */
+
+/* Run the callback on each 802.11 preference */
+prefs_pref_foreach(wlan_prefs, get_wep_key, (gpointer)user_data);
+
+/* Now the key list should be filled */
+
+/*
+ * Signal that we've changed things, and run the 802.11 dissector's
+ * callback
+ */
+wlan_prefs->prefs_changed = TRUE;
+
+prefs_apply(wlan_prefs);
+
+write_wlan_driver_wep_keys_to_regitry(user_data->list);
+
+/* FREE MEMORY */
+/* free the WEP key string */
+for(i=0;i<g_list_length(user_data->list);i++)
+    {
+    g_free(g_list_nth(user_data->list,i)->data);
+    }
+
+/* free the (empty) list */
+g_list_free(user_data->list);
+
+/* free the user_data structure */
+g_free(user_data);
+
+/* airpcap_if_info_free(fake_info_if); */
+
+return TRUE;
+}
+
 /*
  * This function will tell the airpcap driver the key list to use
  * This will be stored into the registry...
@@ -319,7 +380,7 @@ KeysCollectionSize = sizeof(AirpcapKeysCollection) + keys_in_list * sizeof(Airpc
 /*
  * Allocate the collection
  */
-KeysCollection = (PAirpcapKeysCollection)malloc(KeysCollectionSize);
+KeysCollection = (PAirpcapKeysCollection)g_malloc(KeysCollectionSize);
 if(!KeysCollection)
 {
        return FALSE;
@@ -351,8 +412,8 @@ for(i = 0; i < keys_in_list; i++)
        }
 
        g_string_free(new_key,TRUE);
-}
 
+}
 /*
  * Free the old adapter key collection!
  */
@@ -378,6 +439,102 @@ airpcap_save_selected_if_configuration(info_if);
 return TRUE;
 }
 
+/*
+ * This function will tell the airpcap driver the key list to use
+ * This will be stored into the registry...
+ */
+BOOL
+write_wlan_driver_wep_keys_to_regitry(GList* key_list)
+{
+UINT i,j;
+GString *new_key;
+gchar s[3];
+PAirpcapKeysCollection KeysCollection;
+ULONG KeysCollectionSize;
+UCHAR KeyByte;
+UINT keys_in_list = 0;
+decryption_key_t* key_item = NULL;
+airpcap_if_info_t* fake_info_if = NULL;
+
+/* Create the fake_info_if from the first adapter of the list */
+fake_info_if = airpcap_driver_fake_if_info_new();
+
+keys_in_list = g_list_length(key_list);
+
+/*
+ * Save the encryption keys, if we have any of them
+ */
+KeysCollectionSize = 0;
+
+/*
+ * Calculate the size of the keys collection
+ */
+KeysCollectionSize = sizeof(AirpcapKeysCollection) + keys_in_list * sizeof(AirpcapKey);
+
+/*
+ * Allocate the collection
+ */
+KeysCollection = (PAirpcapKeysCollection)g_malloc(KeysCollectionSize);
+if(!KeysCollection)
+{
+       return FALSE;
+}
+
+/*
+ * Populate the key collection
+ */
+KeysCollection->nKeys = keys_in_list;
+
+for(i = 0; i < keys_in_list; i++)
+{
+    KeysCollection->Keys[i].KeyType = AIRPCAP_KEYTYPE_WEP;
+
+       /* Retrieve the Item corresponding to the i-th key */
+       key_item = (decryption_key_t*)g_list_nth_data(key_list,i);
+       new_key = g_string_new(key_item->key->str);
+
+       KeysCollection->Keys[i].KeyLen = new_key->len / 2;
+       memset(&KeysCollection->Keys[i].KeyData, 0, sizeof(KeysCollection->Keys[i].KeyData));
+
+       for(j = 0 ; j < new_key->len; j += 2)
+       {
+               s[0] = new_key->str[j];
+               s[1] = new_key->str[j+1];
+               s[2] = '\0';
+               KeyByte = (UCHAR)strtol(s, NULL, 16);
+               KeysCollection->Keys[i].KeyData[j / 2] = KeyByte;
+       }
+
+       g_string_free(new_key,TRUE);
+}
+
+/*
+ * Free the old adapter key collection!
+ */
+if(fake_info_if->keysCollection != NULL)
+       g_free(fake_info_if->keysCollection);
+
+/*
+ * Set this collection ad the new one
+ */
+fake_info_if->keysCollection = KeysCollection;
+fake_info_if->keysCollectionSize = KeysCollectionSize;
+
+/*
+ * Configuration must be saved
+ */
+fake_info_if->saved = FALSE;
+
+/*
+ * Write down the changes to the registry
+ */
+airpcap_save_driver_if_configuration(fake_info_if);
+
+airpcap_if_info_free(fake_info_if);
+
+return TRUE;
+}
+
 /*
  *  Function used to save to the preference file the Decryption Keys.
  */
@@ -398,7 +555,11 @@ wlan_prefs = prefs_find_module("wlan");
 user_data = (keys_cb_data_t*)g_malloc(sizeof(keys_cb_data_t));
 
 /* Number of keys in key list */
-keys_in_list = (info_if->keysCollectionSize -  sizeof(AirpcapKeysCollection))/sizeof(AirpcapKey);
+/* Number of keys in key list */
+if(info_if->keysCollectionSize != 0)
+    keys_in_list = (guint)(info_if->keysCollectionSize -  sizeof(AirpcapKeysCollection))/sizeof(AirpcapKey);
+else
+    keys_in_list = 0;
 
 for(i=0; i<keys_in_list; i++)
 {
@@ -448,6 +609,140 @@ g_free(user_data);
 return TRUE;
 }
 
+/*
+ *  Function used to save to the preference file the Decryption Keys.
+ */
+int
+save_wlan_driver_wep_keys()
+{
+GList* key_list = NULL;
+char* tmp_key = NULL;
+guint keys_in_list,i;
+keys_cb_data_t* user_data;
+airpcap_if_info_t* fake_info_if = NULL;
+
+/* Create the fake_info_if from the first adapter of the list */
+fake_info_if = airpcap_driver_fake_if_info_new();
+
+/* Retrieve the wlan preferences */
+wlan_prefs = prefs_find_module("wlan");
+
+/* Allocate a structure used to keep infos  between the callbacks */
+user_data = (keys_cb_data_t*)g_malloc(sizeof(keys_cb_data_t));
+
+/* Number of keys in key list */
+/* Number of keys in key list */
+if(fake_info_if->keysCollectionSize != 0)
+    keys_in_list = (guint)(fake_info_if->keysCollectionSize -  sizeof(AirpcapKeysCollection))/sizeof(AirpcapKey);
+else
+    keys_in_list = 0;
+
+for(i=0; i<keys_in_list; i++)
+{
+/* Only if it is a WEP key... */
+if(fake_info_if->keysCollection->Keys[i].KeyType == AIRPCAP_KEYTYPE_WEP)
+    {
+    tmp_key = airpcap_get_key_string(fake_info_if->keysCollection->Keys[i]);
+    key_list = g_list_append(key_list,g_strdup(tmp_key));
+    g_free(tmp_key);
+    }
+}
+
+/* Now we know the exact number of WEP keys in the list, so store it ... */
+keys_in_list = g_list_length(key_list);
+
+/* Fill the structure */
+user_data->list = key_list;
+user_data->current_index = 0;
+user_data->number_of_keys= keys_in_list;
+
+/* Retrieve the wlan preferences */
+wlan_prefs = prefs_find_module("wlan");
+
+/* Run the callback on each 802.11 preference */
+prefs_pref_foreach(wlan_prefs, set_wep_key,  (gpointer)user_data);
+
+/* Signal that we've changed things, and run the 802.11 dissector's
+ * callback */
+wlan_prefs->prefs_changed = TRUE;
+
+/* Apply changes for the specified preference */
+prefs_apply(wlan_prefs);
+
+/* FREE MEMORY */
+/* free the WEP key string */
+for(i=0;i<g_list_length(user_data->list);i++)
+    {
+    g_free(g_list_nth(user_data->list,i)->data);
+    }
+
+/* free the (empty) list */
+g_list_free(user_data->list);
+
+/* free the user_data structure */
+g_free(user_data);
+
+airpcap_if_info_free(fake_info_if);
+
+return keys_in_list;
+}
+
+/*
+ *  Function used to save to the preference file the Decryption Keys.
+ */
+int
+save_wlan_wireshark_wep_keys(GList* key_ls)
+{
+GList* key_list = NULL;
+char* tmp_key = NULL;
+guint keys_in_list,i;
+keys_cb_data_t* user_data;
+airpcap_if_info_t* fake_info_if = NULL;
+
+/* Retrieve the wlan preferences */
+wlan_prefs = prefs_find_module("wlan");
+
+/* Allocate a structure used to keep infos  between the callbacks */
+user_data = (keys_cb_data_t*)g_malloc(sizeof(keys_cb_data_t));
+
+keys_in_list = g_list_length(key_ls);
+
+key_list = key_ls;
+
+/* Fill the structure */
+user_data->list = key_list;
+user_data->current_index = 0;
+user_data->number_of_keys= keys_in_list;
+
+/* Retrieve the wlan preferences */
+wlan_prefs = prefs_find_module("wlan");
+
+/* Run the callback on each 802.11 preference */
+prefs_pref_foreach(wlan_prefs, set_wep_key,  (gpointer)user_data);
+
+/* Signal that we've changed things, and run the 802.11 dissector's
+ * callback */
+wlan_prefs->prefs_changed = TRUE;
+
+/* Apply changes for the specified preference */
+prefs_apply(wlan_prefs);
+
+/* FREE MEMORY */
+/* free the WEP key string */
+for(i=0;i<g_list_length(user_data->list);i++)
+    {
+    g_free(g_list_nth(user_data->list,i)->data);
+    }
+
+/* free the (empty) list */
+g_list_free(user_data->list);
+
+/* free the user_data structure */
+g_free(user_data);
+
+return keys_in_list;
+}
+
 /*
  * Get an error message string for a CANT_GET_INTERFACE_LIST error from
  * "get_airpcap_interface_list()".
@@ -588,6 +883,26 @@ airpcap_if_set_decryption_state(PAirpcapHandle ah, AirpcapDecryptionState Enable
        return g_PAirpcapSetDecryptionState(ah,Enable);
 }
 
+/*
+ * Airpcap wrapper, used to get the decryption enabling of an airpcap driver
+ */
+BOOL
+airpcap_if_get_driver_decryption_state(PAirpcapHandle ah, PAirpcapDecryptionState PEnable)
+{
+       if (!AirpcapLoaded || (g_PAirpcapGetDriverDecryptionState==NULL)) return FALSE;
+       return g_PAirpcapGetDriverDecryptionState(ah,PEnable);
+}
+
+/*
+ * Airpcap wrapper, used to set the decryption enabling of an airpcap driver
+ */
+BOOL
+airpcap_if_set_driver_decryption_state(PAirpcapHandle ah, AirpcapDecryptionState Enable)
+{
+       if (!AirpcapLoaded || (g_PAirpcapSetDriverDecryptionState==NULL)) return FALSE;
+       return g_PAirpcapSetDriverDecryptionState(ah,Enable);
+}
+
 /*
  * Airpcap wrapper, used to get the fcs validation of an airpcap adapter
  */
@@ -628,6 +943,26 @@ airpcap_if_get_device_keys(PAirpcapHandle AdapterHandle, PAirpcapKeysCollection
        return g_PAirpcapGetDeviceKeys(AdapterHandle,KeysCollection,PKeysCollectionSize);
 }
 
+/*
+ * Airpcap wrapper, used to save the driver's set of keys
+ */
+BOOL
+airpcap_if_set_driver_keys(PAirpcapHandle AdapterHandle, PAirpcapKeysCollection KeysCollection)
+{
+       if (!AirpcapLoaded || (g_PAirpcapSetDriverKeys==NULL)) return FALSE;
+       return g_PAirpcapSetDriverKeys(AdapterHandle,KeysCollection);
+}
+
+/*
+ * Airpcap wrapper, used to load the driver's set of keys
+ */
+BOOL
+airpcap_if_get_driver_keys(PAirpcapHandle AdapterHandle, PAirpcapKeysCollection KeysCollection, PUINT PKeysCollectionSize)
+{
+       if (!AirpcapLoaded || (g_PAirpcapGetDriverKeys==NULL)) return FALSE;
+       return g_PAirpcapGetDriverKeys(AdapterHandle,KeysCollection,PKeysCollectionSize);
+}
+
 /*
  * This function will create a new airpcap_if_info_t using a name and a description
  */
@@ -669,40 +1004,154 @@ gchar ebuf[AIRPCAP_ERRBUF_SIZE];
        return if_info;
 }
 
+/*
+ * This function will create a new fake drivers' interface, to load global keys...
+ */
+airpcap_if_info_t*
+airpcap_driver_fake_if_info_new()
+{
+       PAirpcapHandle ad;
+       gchar ebuf[AIRPCAP_ERRBUF_SIZE];
+
+       airpcap_if_info_t *if_info = NULL;
+       airpcap_if_info_t *fake_if_info = NULL;
+
+       /*
+        * Retrieve the first AirPcap adapter available. If no interface is found,
+        * it is not possible to retrieve the driver's settings, so return NULL.
+        */
+       if_info = g_list_nth_data(airpcap_if_list,0);
+       if(if_info == NULL)
+               return NULL;
+
+       fake_if_info = g_malloc(sizeof (airpcap_if_info_t));
+       fake_if_info->name = g_strdup(if_info->name);
+       fake_if_info->description = g_strdup(if_info->description);
+       fake_if_info->loopback = FALSE;
+       fake_if_info->ip_addr = NULL;
+
+       /* Open the 'fake' adapter */
+       ad = airpcap_if_open(if_info->name, ebuf);
+       if(ad)
+               {
+               airpcap_if_get_driver_decryption_state(ad, &(fake_if_info->DecryptionOn));
+               airpcap_if_get_fcs_validation(ad,&(fake_if_info->CrcValidationOn));
+               airpcap_if_get_fcs_presence(ad,&(fake_if_info->IsFcsPresent));
+               airpcap_if_get_link_type(ad,&(fake_if_info->linkType));
+               airpcap_if_get_device_channel(ad,&(fake_if_info->channel));
+               airpcap_if_turn_led_on(ad, 0);
+               fake_if_info->led = TRUE;
+               fake_if_info->blinking = FALSE;
+               fake_if_info->saved = TRUE; /* NO NEED TO BE SAVED */
+
+               /* get the keys, if everything is ok, close the adapter */
+               if(airpcap_if_load_driver_keys(ad,fake_if_info))
+                       airpcap_if_close(ad);
+               }
+
+       return fake_if_info;
+}
+
+/*
+ * USED FOR DEBUG ONLY... PRINTS AN AirPcap ADAPTER STRUCTURE in a fancy way.
+ */
+void
+airpcap_if_info_print(airpcap_if_info_t* if_info)
+{
+if(if_info == NULL)
+       {
+       g_print("\nWARNING : AirPcap Interface pointer is NULL!\n");
+       return;
+       }
+
+g_print("\n----------------- AirPcap Interface \n");
+g_print("              NAME: %s\n",if_info->name);
+g_print("       DESCRIPTION: %s\n",if_info->description);
+g_print("          BLINKING: %s\n",if_info->blinking ? "TRUE" : "FALSE");
+g_print("           CHANNEL: %2u\n",if_info->channel);
+g_print("     CRCVALIDATION: %s\n",if_info->CrcValidationOn ? "ON" : "OFF");
+g_print("        DECRYPTION: %s\n",if_info->DecryptionOn ? "ON" : "OFF");
+g_print("           IP ADDR: %s\n",if_info->ip_addr!=NULL ? "NOT NULL" : "NULL");
+g_print("        FCSPRESENT: %s\n",if_info->IsFcsPresent ? "TRUE" : "FALSE");
+g_print("    KEYSCOLLECTION: %s\n",if_info->keysCollection!=NULL ? "NOT NULL" : "NULL");
+g_print("KEYSCOLLECTIONSIZE: %u\n",if_info->keysCollectionSize);
+g_print("               LED: %s\n",if_info->led ? "ON" : "OFF");
+g_print("          LINKTYPE: %d\n",if_info->linkType);
+g_print("          LOOPBACK: %s\n",if_info->loopback ? "YES" : "NO");
+g_print("         (GTK) TAG: %d\n",if_info->tag);
+g_print("\n\n");
+}
+
 /*
  * Function used to load the WEP keys for a selected interface
  */
 BOOL
 airpcap_if_load_keys(PAirpcapHandle ad, airpcap_if_info_t *if_info)
 {
-       if (!if_info) return FALSE;
+if(!if_info) return FALSE;
 
-       if_info->keysCollectionSize = 0;
-       if_info->keysCollection = NULL;
+if_info->keysCollectionSize = 0;
+if_info->keysCollection = NULL;
 
-       if(!airpcap_if_get_device_keys(ad, NULL, &(if_info->keysCollectionSize)))
+if(!airpcap_if_get_device_keys(ad, NULL, &(if_info->keysCollectionSize)))
+       {
+       if(if_info->keysCollectionSize == 0)
                {
-               if(if_info->keysCollectionSize == 0)
-                       {
-                       if_info->keysCollection = NULL;
-                       airpcap_if_close(ad);
-                       return FALSE;
-                       }
+               if_info->keysCollection = NULL;
+               airpcap_if_close(ad);
+               return FALSE;
+               }
 
-               if_info->keysCollection = (PAirpcapKeysCollection)malloc(if_info->keysCollectionSize);
-               if(!if_info->keysCollection)
-                       {
-                       if_info->keysCollectionSize = 0;
-                       if_info->keysCollection = NULL;
-                       airpcap_if_close(ad);
-                       return FALSE;
-                       }
+       if_info->keysCollection = (PAirpcapKeysCollection)g_malloc(if_info->keysCollectionSize);
+       if(!if_info->keysCollection)
+               {
+               if_info->keysCollectionSize = 0;
+               if_info->keysCollection = NULL;
+               airpcap_if_close(ad);
+               return FALSE;
+               }
 
-               airpcap_if_get_device_keys(ad, if_info->keysCollection, &(if_info->keysCollectionSize));
-               return TRUE;
+       airpcap_if_get_device_keys(ad, if_info->keysCollection, &(if_info->keysCollectionSize));
+       return TRUE;
+       }
+
+airpcap_if_close(ad);
+return FALSE;
+}
+
+/*
+ * Function used to load the WEP keys for a selected interface
+ */
+BOOL
+airpcap_if_load_driver_keys(PAirpcapHandle ad, airpcap_if_info_t *if_info)
+{
+if_info->keysCollectionSize = 0;
+if_info->keysCollection = NULL;
+
+if(!airpcap_if_get_driver_keys(ad, NULL, &(if_info->keysCollectionSize)))
+       {
+       if(if_info->keysCollectionSize == 0)
+               {
+               if_info->keysCollection = NULL;
+               airpcap_if_close(ad);
+               return FALSE;
                }
-       airpcap_if_close(ad);
-       return FALSE;
+
+       if_info->keysCollection = (PAirpcapKeysCollection)g_malloc(if_info->keysCollectionSize);
+       if(!if_info->keysCollection)
+               {
+               if_info->keysCollectionSize = 0;
+               if_info->keysCollection = NULL;
+               airpcap_if_close(ad);
+               return FALSE;
+               }
+
+       airpcap_if_get_driver_keys(ad, if_info->keysCollection, &(if_info->keysCollectionSize));
+       return TRUE;
+       }
+
+airpcap_if_close(ad);
+return FALSE;
 }
 
 /*
@@ -711,12 +1160,22 @@ airpcap_if_load_keys(PAirpcapHandle ad, airpcap_if_info_t *if_info)
 void
 airpcap_if_save_keys(PAirpcapHandle ad, airpcap_if_info_t *if_info)
 {
-       if (!if_info || !AirpcapLoaded) return;
+       if(!if_info || !AirpcapLoaded) return;
 
        if(if_info->keysCollection != NULL)
                g_PAirpcapSetDeviceKeys(ad,if_info->keysCollection);
 }
 
+/*
+ * Function used to save the WEP keys for a selected interface
+ */
+void
+airpcap_if_save_driver_keys(PAirpcapHandle ad, airpcap_if_info_t *if_info)
+{
+       if(if_info->keysCollection != NULL)
+               airpcap_if_set_driver_keys(ad,if_info->keysCollection);
+}
+
 /*
  * Callback used to free an instance of airpcap_if_info_t
  */
@@ -733,7 +1192,10 @@ free_airpcap_if_cb(gpointer data, gpointer user_data _U_)
 
        /* XXX - FREE THE WEP KEY LIST HERE!!!*/
        if(if_info->keysCollection != NULL)
+               {
                g_free(if_info->keysCollection);
+               if_info->keysCollection = NULL;
+               }
 
        if(if_info->ip_addr != NULL)
                g_slist_free(if_info->ip_addr);
@@ -763,7 +1225,7 @@ get_airpcap_interface_list(int *err, char *err_str)
        GList  *il = NULL;
        airpcap_if_info_t *if_info;
        int i, n_adapts;
-       AirpcapDeviceDescription *devsList, *adListEntry;
+    AirpcapDeviceDescription *devsList, *adListEntry;
 
        if (err)
                *err = NO_AIRPCAP_INTERFACES_FOUND;
@@ -799,7 +1261,7 @@ get_airpcap_interface_list(int *err, char *err_str)
        for(i = 0; i < n_adapts; i++)
        {
                if_info = airpcap_if_info_new(adListEntry->Name, adListEntry->Description);
-               il = g_list_append(il, if_info);
+        il = g_list_append(il, if_info);
 
                adListEntry = adListEntry->next;
        }
@@ -816,28 +1278,28 @@ get_airpcap_interface_list(int *err, char *err_str)
 gchar* get_airpcap_name_from_description(GList* if_list, gchar* description)
 {
 unsigned int ifn;
-       GList* curr;
-       airpcap_if_info_t* if_info;
+GList* curr;
+airpcap_if_info_t* if_info;
 
-       ifn = 0;
-       if(if_list != NULL)
+ifn = 0;
+if(if_list != NULL)
+       {
+       while( ifn < g_list_length(if_list) )
                {
-               while( ifn < g_list_length(if_list) )
-                       {
-                       curr = g_list_nth(if_list, ifn);
-
-                       if_info = NULL;
-                       if(curr != NULL)
-                               if_info = curr->data;
-                       if(if_info != NULL)
-                               if ( g_ascii_strcasecmp(if_info->description,description) == 0)
-                                       {
-                                       return if_info->name;
-                                       }
-                       ifn++;
-                       }
+               curr = g_list_nth(if_list, ifn);
+
+               if_info = NULL;
+               if(curr != NULL)
+                       if_info = curr->data;
+               if(if_info != NULL)
+                       if ( g_ascii_strcasecmp(if_info->description,description) == 0)
+                               {
+                               return if_info->name;
+                               }
+               ifn++;
                }
-       return NULL;
+       }
+return NULL;
 }
 
 /*
@@ -846,29 +1308,29 @@ unsigned int ifn;
  */
 airpcap_if_info_t* get_airpcap_if_by_name(GList* if_list, const gchar* name)
 {
-       unsigned int ifn;
-       GList* curr;
-       airpcap_if_info_t* if_info;
+unsigned int ifn;
+GList* curr;
+airpcap_if_info_t* if_info;
 
-       ifn = 0;
-       if(if_list != NULL)
+ifn = 0;
+if(if_list != NULL)
+       {
+       while( ifn < g_list_length(if_list) )
                {
-               while( ifn < g_list_length(if_list) )
-                       {
-                       curr = g_list_nth(if_list, ifn);
-
-                       if_info = NULL;
-                       if(curr != NULL)
-                               if_info = curr->data;
-                       if(if_info != NULL)
-                               if ( g_ascii_strcasecmp(if_info->name,name) == 0)
-                                       {
-                                       return if_info;
-                                       }
-                       ifn++;
-                       }
+               curr = g_list_nth(if_list, ifn);
+
+               if_info = NULL;
+               if(curr != NULL)
+                       if_info = curr->data;
+               if(if_info != NULL)
+                       if ( g_ascii_strcasecmp(if_info->name,name) == 0)
+                               {
+                               return if_info;
+                               }
+               ifn++;
                }
-       return NULL;
+       }
+return NULL;
 }
 
 /*
@@ -877,46 +1339,67 @@ airpcap_if_info_t* get_airpcap_if_by_name(GList* if_list, const gchar* name)
 gchar*
 airpcap_get_key_string(AirpcapKey key)
 {
-       unsigned int j = 0;
-       unsigned int l = 0;
-       gchar *dst,*src;
+unsigned int j = 0;
+unsigned int l = 0;
+gchar *dst,*src;
 
-       src = NULL;
+src = NULL;
 
-       if(key.KeyType == AIRPCAP_KEYTYPE_WEP)
-               {
-               if(key.KeyLen != 0)
+if(key.KeyType == AIRPCAP_KEYTYPE_WEP)
+       {
+       if(key.KeyLen != 0)
+           {
+        /* Allocate the string used to store the ASCII representation of the WEP key */
+        dst = (gchar*)g_malloc(sizeof(gchar)*WEP_KEY_MAX_CHAR_SIZE + 1);
+        /* Make sure that the first char is '\0' in order to make g_strlcat() work */
+        dst[0]='\0';
+
+           for(j = 0; j < key.KeyLen; j++)
                    {
-               /* Allocate the string used to store the ASCII representation of the WEP key */
-               dst = (gchar*)g_malloc(sizeof(gchar)*WEP_KEY_MAX_CHAR_SIZE + 1);
-               /* Make sure that the first char is '\0' in order to make g_strlcat() work */
-               dst[0]='\0';
-
-                   for(j = 0; j < key.KeyLen; j++)
-                           {
-                           src = g_strdup_printf("%.2x\0", key.KeyData[j]);
-                           /*
-                            * XXX - use g_strconcat() or GStrings instead ???
-                            */
-                       l = g_strlcat(dst,src,WEP_KEY_MAX_CHAR_SIZE+1);
-                       }
-               g_free(src);
-               }
+                   src = g_strdup_printf("%.2x\0", key.KeyData[j]);
+                       /*
+                        * XXX - use g_strconcat() or GStrings instead ???
+                        */
+               l = g_strlcat(dst,src,WEP_KEY_MAX_CHAR_SIZE+1);
+               }
+       g_free(src);
+        }
+       }
+else if(key.KeyType == AIRPCAP_KEYTYPE_TKIP)
+    {
+    /* XXX - Add code here */
+    }
+else if(key.KeyType == AIRPCAP_KEYTYPE_CCMP)
+    {
+    /* XXX - Add code here */
+    }
+else
+    {
+    /* XXX - Add code here */
+    }
+
+return dst;
+}
+
+/*
+ * Clear keys and decryption status for the specified interface
+ */
+void
+airpcap_if_clear_decryption_settings(airpcap_if_info_t* info_if)
+{
+if(info_if != NULL)
+       {
+       if(info_if->keysCollection != NULL)
+               {
+               g_free(info_if->keysCollection);
+               info_if->keysCollection = NULL;
                }
-       else if(key.KeyType == AIRPCAP_KEYTYPE_TKIP)
-           {
-           /* XXX - Add code here */
-           }
-       else if(key.KeyType == AIRPCAP_KEYTYPE_CCMP)
-           {
-           /* XXX - Add code here */
-           }
-       else
-           {
-           /* XXX - Add code here */
-           }
 
-       return dst;
+       info_if->keysCollectionSize = 0;
+
+       info_if->DecryptionOn = FALSE;
+       info_if->saved = FALSE;
+       }
 }
 
 /*
@@ -925,29 +1408,29 @@ airpcap_get_key_string(AirpcapKey key)
  */
 gpointer get_airpcap_if_from_description(GList* if_list, const gchar* description)
 {
-       unsigned int ifn;
-       GList* curr;
-       airpcap_if_info_t* if_info;
+unsigned int ifn;
+GList* curr;
+airpcap_if_info_t* if_info;
 
-       ifn = 0;
-       if(if_list != NULL)
+ifn = 0;
+if(if_list != NULL)
+       {
+       while( ifn < g_list_length(if_list) )
                {
-               while( ifn < g_list_length(if_list) )
-                       {
-                       curr = g_list_nth(if_list, ifn);
-
-                       if_info = NULL;
-                       if(curr != NULL)
-                               if_info = curr->data;
-                       if(if_info != NULL)
-                               if ( g_ascii_strcasecmp(if_info->description,description) == 0)
-                                       {
-                                       return if_info;
-                                       }
-                       ifn++;
-                       }
+               curr = g_list_nth(if_list, ifn);
+
+               if_info = NULL;
+               if(curr != NULL)
+                       if_info = curr->data;
+               if(if_info != NULL)
+                       if ( g_ascii_strcasecmp(if_info->description,description) == 0)
+                               {
+                               return if_info;
+                               }
+               ifn++;
                }
-       return NULL;
+       }
+return NULL;
 }
 
 /*
@@ -1006,19 +1489,19 @@ airpcap_get_if_string_number_from_description(gchar* description)
 airpcap_if_info_t*
 airpcap_get_default_if(GList* airpcap_if_list)
 {
-       int ifn = 0;
-       GList* popdown_if_list = NULL;
-       GList* curr = NULL;
+int ifn = 0;
+GList* popdown_if_list = NULL;
+GList* curr = NULL;
 
-               gchar* s;
-               airpcap_if_info_t* if_info = NULL;
+       gchar* s;
+       airpcap_if_info_t* if_info = NULL;
 
-           if(prefs.capture_device != NULL)
-           {
-               s = g_strdup(get_if_name(prefs.capture_device));
-               if_info = get_airpcap_if_by_name(airpcap_if_list,g_strdup(get_if_name(prefs.capture_device)));
-               g_free(s);
-           }
+    if(prefs.capture_device != NULL)
+    {
+       s = g_strdup(get_if_name(prefs.capture_device));
+       if_info = get_airpcap_if_by_name(airpcap_if_list,g_strdup(get_if_name(prefs.capture_device)));
+       g_free(s);
+    }
        return if_info;
 }
 
@@ -1028,39 +1511,39 @@ airpcap_get_default_if(GList* airpcap_if_list)
 void
 airpcap_load_selected_if_configuration(airpcap_if_info_t* if_info)
 {
-       gchar ebuf[AIRPCAP_ERRBUF_SIZE];
-       PAirpcapHandle ad;
-
-       if(if_info != NULL)
-               {
-               ad = airpcap_if_open(get_airpcap_name_from_description(airpcap_if_list, if_info->description), ebuf);
+gchar ebuf[AIRPCAP_ERRBUF_SIZE];
+PAirpcapHandle ad;
 
-               if(ad)
-                       {
-                       /* Stop blinking (if it was blinkig!)*/
-                       if(if_info->blinking)
-                               {
-                               /* Turn on the light (if it was off) */
-                               if(!(if_info->led)) airpcap_if_turn_led_on(ad, 0);
-                               }
+if(if_info != NULL)
+       {
+       ad = airpcap_if_open(get_airpcap_name_from_description(airpcap_if_list, if_info->description), ebuf);
 
-                       /* Apply settings... */
-                       airpcap_if_get_device_channel(ad,&(if_info->channel));
-                       airpcap_if_get_fcs_validation(ad,&(if_info->CrcValidationOn));
-                       airpcap_if_get_fcs_presence(ad,&(if_info->IsFcsPresent));
-                       airpcap_if_get_link_type(ad,&(if_info->linkType));
-                       airpcap_if_get_decryption_state(ad, &(if_info->DecryptionOn));
-                       /* get the keys, if everything is ok, close the adapter */
-                       if(airpcap_if_load_keys(ad,if_info))
-                               airpcap_if_close(ad);
-
-                       if_info->saved = TRUE;
-                       }
-               else
+       if(ad)
+               {
+               /* Stop blinking (if it was blinkig!)*/
+               if(if_info->blinking)
                        {
-                       simple_dialog(ESD_TYPE_ERROR, ESD_BTN_OK, " Error in opening adapter for %s",if_info->description);
+                       /* Turn on the light (if it was off) */
+                       if(!(if_info->led)) airpcap_if_turn_led_on(ad, 0);
                        }
+
+               /* Apply settings... */
+               airpcap_if_get_device_channel(ad,&(if_info->channel));
+               airpcap_if_get_fcs_validation(ad,&(if_info->CrcValidationOn));
+               airpcap_if_get_fcs_presence(ad,&(if_info->IsFcsPresent));
+               airpcap_if_get_link_type(ad,&(if_info->linkType));
+               airpcap_if_get_decryption_state(ad, &(if_info->DecryptionOn));
+               /* get the keys, if everything is ok, close the adapter */
+               if(airpcap_if_load_keys(ad,if_info))
+                       airpcap_if_close(ad);
+
+               if_info->saved = TRUE;
                }
+       else
+               {
+               simple_dialog(ESD_TYPE_ERROR, ESD_BTN_OK, " Error in opening adapter for %s",if_info->description);
+               }
+       }
 }
 
 /*
@@ -1069,47 +1552,76 @@ airpcap_load_selected_if_configuration(airpcap_if_info_t* if_info)
 void
 airpcap_save_selected_if_configuration(airpcap_if_info_t* if_info)
 {
-       gchar ebuf[AIRPCAP_ERRBUF_SIZE];
-       PAirpcapHandle ad;
+gchar ebuf[AIRPCAP_ERRBUF_SIZE];
+PAirpcapHandle ad;
 
-       if(if_info != NULL)
-               {
-               ad = airpcap_if_open(get_airpcap_name_from_description(airpcap_if_list, if_info->description), ebuf);
+if(if_info != NULL)
+       {
+       ad = airpcap_if_open(get_airpcap_name_from_description(airpcap_if_list, if_info->description), ebuf);
 
-               if(ad)
+       if(ad)
+               {
+               /* Stop blinking (if it was blinkig!)*/
+               if(if_info->blinking)
                        {
-                       /* Stop blinking (if it was blinkig!)*/
-                       if(if_info->blinking)
-                               {
-                               /* Turn on the light (if it was off) */
-                               if(!(if_info->led)) airpcap_if_turn_led_on(ad, 0);
-                               }
-
-                       /* Apply settings... */
-                       airpcap_if_set_device_channel(ad,if_info->channel);
-                       airpcap_if_set_fcs_validation(ad,if_info->CrcValidationOn);
-                       airpcap_if_set_fcs_presence(ad,if_info->IsFcsPresent);
-                       airpcap_if_set_link_type(ad,if_info->linkType);
-                       airpcap_if_set_decryption_state(ad, if_info->DecryptionOn);
-                       airpcap_if_save_keys(ad,if_info);
+                       /* Turn on the light (if it was off) */
+                       if(!(if_info->led)) airpcap_if_turn_led_on(ad, 0);
+                       }
 
-                       /* ... and save them */
-                       if(!airpcap_if_store_cur_config_as_adapter_default(ad))
-                               {
-                               simple_dialog(ESD_TYPE_ERROR, ESD_BTN_OK, "Cannot save Wireless configuration!!!\nRemember that in order to store the configuration in the registry you have to:\n\n- Close all the airpcap-based applications.\n- Be sure to have administrative privileges.");
-                               if_info->saved = FALSE;
-                               airpcap_if_close(ad);
-                               return;
-                               }
+               /* Apply settings... */
+               airpcap_if_set_device_channel(ad,if_info->channel);
+               airpcap_if_set_fcs_validation(ad,if_info->CrcValidationOn);
+               airpcap_if_set_fcs_presence(ad,if_info->IsFcsPresent);
+               airpcap_if_set_link_type(ad,if_info->linkType);
+               airpcap_if_set_decryption_state(ad, if_info->DecryptionOn);
+               airpcap_if_save_keys(ad,if_info);
 
-                       if_info->saved = TRUE;
-                       airpcap_if_close(ad);
-                       }
-               else
+               /* ... and save them */
+               if(!airpcap_if_store_cur_config_as_adapter_default(ad))
                        {
-                       simple_dialog(ESD_TYPE_ERROR, ESD_BTN_OK, " Error in opening adapter for %s",if_info->description);
+                       simple_dialog(ESD_TYPE_ERROR, ESD_BTN_OK, "Cannot save Wireless configuration!!!\nRemember that in order to store the configuration in the registry you have to:\n\n- Close all the airpcap-based applications.\n- Be sure to have administrative privileges.");
+                       if_info->saved = FALSE;
+                       airpcap_if_close(ad);
+                       return;
                        }
+
+               if_info->saved = TRUE;
+               airpcap_if_close(ad);
+               }
+       else
+               {
+               simple_dialog(ESD_TYPE_ERROR, ESD_BTN_OK, " Error in opening adapter for %s",if_info->description);
+               }
+       }
+}
+
+/*
+ * Save the configuration for the specified interface
+ */
+void
+airpcap_save_driver_if_configuration(airpcap_if_info_t* fake_if_info)
+{
+gchar ebuf[AIRPCAP_ERRBUF_SIZE];
+PAirpcapHandle ad;
+
+if(fake_if_info != NULL)
+       {
+       ad = airpcap_if_open(fake_if_info->name, ebuf);
+
+       if(ad)
+               {
+               /* Apply decryption settings... */
+               airpcap_if_set_driver_decryption_state(ad, fake_if_info->DecryptionOn);
+               airpcap_if_save_driver_keys(ad,fake_if_info);
+               airpcap_if_close(ad);
                }
+       else
+               {
+               simple_dialog(ESD_TYPE_ERROR, ESD_BTN_OK, " Error in opening adapter for %s",fake_if_info->description);
+               }
+       }
+
+return;
 }
 
 /*
@@ -1121,37 +1633,43 @@ airpcap_save_selected_if_configuration(airpcap_if_info_t* if_info)
 void
 print_key_list(GList* key_list)
 {
-       gint n,i;
-       decryption_key_t* tmp;
+gint n,i;
+decryption_key_t* tmp;
 
-       n = g_list_length(key_list);
+if(key_list == NULL)
+{
+g_print("\n\n******* KEY LIST NULL *******\n\n");
+return;
+}
 
-       g_print("\n\n********* KEY LIST **********\n\n");
+n = g_list_length(key_list);
 
-       g_print("NUMBER OF KEYS IN LIST : %d\n\n",n);
+g_print("\n\n********* KEY LIST **********\n\n");
 
-       for(i =0; i < n; i++)
-       {
-               g_print("[%d] :\n",i+1);
-               tmp = (decryption_key_t*)(g_list_nth_data(key_list,i));
-               g_print("KEY : %s\n",tmp->key->str);
-
-               g_print("BITS: %d\n",tmp->bits);
-
-               if(tmp->type == AIRPCAP_KEYTYPE_WEP)
-                   g_print("TYPE: %s\n",AIRPCAP_WEP_KEY_STRING);
-               else if(tmp->type == AIRPCAP_KEYTYPE_TKIP)
-                   g_print("TYPE: %s\n",AIRPCAP_WPA_KEY_STRING);
-               else if(tmp->type == AIRPCAP_KEYTYPE_CCMP)
-                   g_print("TYPE: %s\n",AIRPCAP_WPA2_KEY_STRING);
-               else
-                   g_print("TYPE: %s\n","???");
+g_print("NUMBER OF KEYS IN LIST : %d\n\n",n);
 
-               g_print("SSID: %s\n",(tmp->ssid != NULL) ? tmp->ssid->str : "---");
-               g_print("\n");
-       }
+for(i =0; i < n; i++)
+{
+g_print("[%d] :\n",i+1);
+tmp = (decryption_key_t*)(g_list_nth_data(key_list,i));
+g_print("KEY : %s\n",tmp->key->str);
+
+g_print("BITS: %d\n",tmp->bits);
+
+if(tmp->type == AIRPCAP_KEYTYPE_WEP)
+    g_print("TYPE: %s\n",AIRPCAP_WEP_KEY_STRING);
+else if(tmp->type == AIRPCAP_KEYTYPE_TKIP)
+    g_print("TYPE: %s\n",AIRPCAP_WPA_KEY_STRING);
+else if(tmp->type == AIRPCAP_KEYTYPE_CCMP)
+    g_print("TYPE: %s\n",AIRPCAP_WPA2_KEY_STRING);
+else
+    g_print("TYPE: %s\n","???");
+
+g_print("SSID: %s\n",(tmp->ssid != NULL) ? tmp->ssid->str : "---");
+g_print("\n");
+}
 
-       g_print("\n*****************************\n\n");
+g_print("\n*****************************\n\n");
 }
 
 /*
@@ -1161,110 +1679,184 @@ print_key_list(GList* key_list)
 GList*
 get_airpcap_device_keys(airpcap_if_info_t* info_if)
 {
-       /* tmp vars */
-       char* tmp_key = NULL;
-       guint i,keys_in_list = 0;
+/* tmp vars */
+char* tmp_key = NULL;
+guint i,keys_in_list = 0;
 
-       /* real vars*/
-       decryption_key_t *new_key  = NULL;
-       GList            *key_list = NULL;
+/* real vars*/
+decryption_key_t *new_key  = NULL;
+GList            *key_list = NULL;
 
-       /* Number of keys in key list */
-       if(info_if->keysCollectionSize != 0)
-           keys_in_list = (guint)(info_if->keysCollectionSize -  sizeof(AirpcapKeysCollection))/sizeof(AirpcapKey);
-       else
-           keys_in_list = 0;
+/* Number of keys in key list */
+if(info_if->keysCollectionSize != 0)
+    keys_in_list = (guint)(info_if->keysCollectionSize -  sizeof(AirpcapKeysCollection))/sizeof(AirpcapKey);
+else
+    keys_in_list = 0;
 
-       for(i=0; i<keys_in_list; i++)
-       {
-       /* Different things to do depending on the key type  */
-       if(info_if->keysCollection->Keys[i].KeyType == AIRPCAP_KEYTYPE_WEP)
-           {
-           /* allocate memory for the new key item */
-           new_key = (decryption_key_t*)g_malloc(sizeof(decryption_key_t));
+for(i=0; i<keys_in_list; i++)
+{
+/* Different things to do depending on the key type  */
+if(info_if->keysCollection->Keys[i].KeyType == AIRPCAP_KEYTYPE_WEP)
+    {
+    /* allocate memory for the new key item */
+    new_key = (decryption_key_t*)g_malloc(sizeof(decryption_key_t));
 
-           /* fill the fields */
-           /* KEY */
-           tmp_key = airpcap_get_key_string(info_if->keysCollection->Keys[i]);
-           new_key->key = g_string_new(tmp_key);
-           g_free(tmp_key);
+    /* fill the fields */
+    /* KEY */
+    tmp_key = airpcap_get_key_string(info_if->keysCollection->Keys[i]);
+    new_key->key = g_string_new(tmp_key);
+    g_free(tmp_key);
 
-           /* BITS */
-           new_key->bits = new_key->key->len *4; /* every char is 4 bits in WEP keys (it is an exadecimal number) */
+    /* BITS */
+    new_key->bits = new_key->key->len *4; /* every char is 4 bits in WEP keys (it is an exadecimal number) */
 
-           /* SSID not used in WEP keys */
-           new_key->ssid = NULL;
+    /* SSID not used in WEP keys */
+    new_key->ssid = NULL;
 
-           /* TYPE (WEP in this case) */
-           new_key->type = info_if->keysCollection->Keys[i].KeyType;
+    /* TYPE (WEP in this case) */
+    new_key->type = info_if->keysCollection->Keys[i].KeyType;
 
-           /* Append the new element in the list */
-           key_list = g_list_append(key_list,(gpointer)new_key);
-           }
-       else if(info_if->keysCollection->Keys[i].KeyType == AIRPCAP_KEYTYPE_TKIP)
-           {
-           /* XXX - Not supported yet */
-           }
-       else if(info_if->keysCollection->Keys[i].KeyType == AIRPCAP_KEYTYPE_CCMP)
-           {
-           /* XXX - Not supported yet */
-           }
+    /* Append the new element in the list */
+    key_list = g_list_append(key_list,(gpointer)new_key);
+    }
+else if(info_if->keysCollection->Keys[i].KeyType == AIRPCAP_KEYTYPE_TKIP)
+    {
+    /* XXX - Not supported yet */
+    }
+else if(info_if->keysCollection->Keys[i].KeyType == AIRPCAP_KEYTYPE_CCMP)
+    {
+    /* XXX - Not supported yet */
+    }
 }
 
 return key_list;
 }
 
 /*
- * Returns the list of the decryption keys specified for wireshark, NULL if
- * no key is found
+ * Retrieves a GList of decryption_key_t structures containing infos about the
+ * keys for the global AirPcap driver... returns NULL if no keys are found.
  */
 GList*
-get_wireshark_keys()
+get_airpcap_driver_keys()
 {
-       keys_cb_data_t* wep_user_data = NULL;
-       keys_cb_data_t* wpa_user_data = NULL;
-       keys_cb_data_t* wpa2_user_data= NULL;
+/* tmp vars */
+char* tmp_key = NULL;
+guint i,keys_in_list = 0;
 
-       gchar *tmp = NULL;
+/* real vars*/
+decryption_key_t *new_key  = NULL;
+GList            *key_list = NULL;
 
-       GList* final_list = NULL;
-       GList* wep_final_list = NULL;
-       GList* wpa_final_list = NULL;
-       GList* wpa2_final_list = NULL;
+/*
+ * To read the drivers general settings we need to create and use one airpcap adapter...
+ * The only way to do that is to instantiate a fake adapter, and then close it and delete it.
+ */
+airpcap_if_info_t* fake_info_if = NULL;
 
-       /* Retrieve the wlan preferences */
-       wlan_prefs = prefs_find_module("wlan");
+/* Create the fake_info_if from the first adapter of the list */
+fake_info_if = airpcap_driver_fake_if_info_new();
 
-       /* Allocate a structure used to keep infos  between the callbacks */
-       wep_user_data = (keys_cb_data_t*)g_malloc(sizeof(keys_cb_data_t));
+if(fake_info_if == NULL)
+       return NULL;
 
-       /* Fill the structure */
-       wep_user_data->list = NULL;
-       wep_user_data->current_index = 0;
-       wep_user_data->number_of_keys= 0; /* Still unknown */
+/* Number of keys in key list */
+if(fake_info_if->keysCollectionSize != 0)
+    keys_in_list = (guint)(fake_info_if->keysCollectionSize -  sizeof(AirpcapKeysCollection))/sizeof(AirpcapKey);
+else
+    keys_in_list = 0;
 
-       /* Run the callback on each 802.11 preference */
-       /* XXX - Right now, only WEP keys will be loaded */
-       prefs_pref_foreach(wlan_prefs, get_wep_key, (gpointer)wep_user_data);
-       prefs_pref_foreach(wlan_prefs, get_wpa_key, (gpointer)wpa_user_data);
-       prefs_pref_foreach(wlan_prefs, get_wpa2_key, (gpointer)wpa2_user_data);
+for(i=0; i<keys_in_list; i++)
+{
+/* Different things to do depending on the key type  */
+if(fake_info_if->keysCollection->Keys[i].KeyType == AIRPCAP_KEYTYPE_WEP)
+    {
+    /* allocate memory for the new key item */
+    new_key = (decryption_key_t*)g_malloc(sizeof(decryption_key_t));
 
-       /* Copy the list field in the user data structure pointer into the final_list */
-       if(wep_user_data != NULL)  wep_final_list  = wep_user_data->list;
-       if(wpa_user_data != NULL)  wpa_final_list  = wpa_user_data->list;
-       if(wpa2_user_data != NULL) wpa2_final_list = wpa2_user_data->list;
+    /* fill the fields */
+    /* KEY */
+    tmp_key = airpcap_get_key_string(fake_info_if->keysCollection->Keys[i]);
+    new_key->key = g_string_new(tmp_key);
+    g_free(tmp_key);
+
+    /* BITS */
+    new_key->bits = new_key->key->len *4; /* every char is 4 bits in WEP keys (it is an exadecimal number) */
+
+    /* SSID not used in WEP keys */
+    new_key->ssid = NULL;
+
+    /* TYPE (WEP in this case) */
+    new_key->type = fake_info_if->keysCollection->Keys[i].KeyType;
 
-       /* XXX - Merge the three lists!!!!! */
-       final_list = wep_final_list;
+    /* Append the new element in the list */
+    key_list = g_list_append(key_list,(gpointer)new_key);
+    }
+else if(fake_info_if->keysCollection->Keys[i].KeyType == AIRPCAP_KEYTYPE_TKIP)
+    {
+    /* XXX - Not supported yet */
+    }
+else if(fake_info_if->keysCollection->Keys[i].KeyType == AIRPCAP_KEYTYPE_CCMP)
+    {
+    /* XXX - Not supported yet */
+    }
+}
 
-       /* free the wep_user_data structure */
-       g_free(wep_user_data);
-       /* free the wpa_user_data structure */
-       g_free(wpa_user_data);
-       /* free the wpa2_user_data structure */
-       g_free(wpa2_user_data);
+airpcap_if_info_free(fake_info_if);
 
-       return final_list;
+return key_list;
+}
+
+/*
+ * Returns the list of the decryption keys specified for wireshark, NULL if
+ * no key is found
+ */
+GList*
+get_wireshark_keys()
+{
+keys_cb_data_t* wep_user_data = NULL;
+keys_cb_data_t* wpa_user_data = NULL;
+keys_cb_data_t* wpa2_user_data= NULL;
+
+gchar *tmp = NULL;
+
+GList* final_list = NULL;
+GList* wep_final_list = NULL;
+GList* wpa_final_list = NULL;
+GList* wpa2_final_list = NULL;
+
+/* Retrieve the wlan preferences */
+wlan_prefs = prefs_find_module("wlan");
+
+/* Allocate a structure used to keep infos  between the callbacks */
+wep_user_data = (keys_cb_data_t*)g_malloc(sizeof(keys_cb_data_t));
+
+/* Fill the structure */
+wep_user_data->list = NULL;
+wep_user_data->current_index = 0;
+wep_user_data->number_of_keys= 0; /* Still unknown */
+
+/* Run the callback on each 802.11 preference */
+/* XXX - Right now, only WEP keys will be loaded */
+prefs_pref_foreach(wlan_prefs, get_wep_key, (gpointer)wep_user_data);
+prefs_pref_foreach(wlan_prefs, get_wpa_key, (gpointer)wpa_user_data);
+prefs_pref_foreach(wlan_prefs, get_wpa2_key, (gpointer)wpa2_user_data);
+
+/* Copy the list field in the user data structure pointer into the final_list */
+if(wep_user_data != NULL)  wep_final_list  = wep_user_data->list;
+if(wpa_user_data != NULL)  wpa_final_list  = wpa_user_data->list;
+if(wpa2_user_data != NULL) wpa2_final_list = wpa2_user_data->list;
+
+/* XXX - Merge the three lists!!!!! */
+final_list = wep_final_list;
+
+/* free the wep_user_data structure */
+g_free(wep_user_data);
+/* free the wpa_user_data structure */
+g_free(wpa_user_data);
+/* free the wpa2_user_data structure */
+g_free(wpa2_user_data);
+
+return final_list;
 }
 
 /*
@@ -1277,115 +1869,115 @@ get_wireshark_keys()
 GList*
 merge_key_list(GList* list1, GList* list2)
 {
-       guint n1=0,n2=0;
-       guint i;
-       decryption_key_t *dk1=NULL,
-                         *dk2=NULL,
-                         *new_dk=NULL;
+guint n1=0,n2=0;
+guint i;
+decryption_key_t *dk1=NULL,
+                 *dk2=NULL,
+                 *new_dk=NULL;
 
-       GList* merged_list = NULL;
+GList* merged_list = NULL;
 
-       if( (list1 == NULL) && (list2 == NULL) )
-           return NULL;
+if( (list1 == NULL) && (list2 == NULL) )
+    return NULL;
 
-       if(list1 == NULL)
-           {
-           n1 = 0;
-           n2 = g_list_length(list2);
+if(list1 == NULL)
+    {
+    n1 = 0;
+    n2 = g_list_length(list2);
 
-           for(i=0;i<n2;i++)
-               {
-               new_dk = (decryption_key_t*)g_malloc(sizeof(decryption_key_t));
-               dk2 = (decryption_key_t *)g_list_nth_data(list2,i);
-
-               new_dk->bits = dk2->bits;
-               new_dk->type = dk2->type;
-               new_dk->key  = g_string_new(dk2->key->str);
-               if(dk2->ssid != NULL)
-                   new_dk->ssid = g_string_new(dk2->ssid->str);
-               else
-                   new_dk->ssid = NULL;
+    for(i=0;i<n2;i++)
+        {
+        new_dk = (decryption_key_t*)g_malloc(sizeof(decryption_key_t));
+        dk2 = (decryption_key_t *)g_list_nth_data(list2,i);
+
+        new_dk->bits = dk2->bits;
+        new_dk->type = dk2->type;
+        new_dk->key  = g_string_new(dk2->key->str);
+        if(dk2->ssid != NULL)
+            new_dk->ssid = g_string_new(dk2->ssid->str);
+        else
+            new_dk->ssid = NULL;
+
+               /* Check the total length of the merged list */
+               if(g_list_length(merged_list) < MAX_ENCRYPTION_KEYS)
+                       merged_list = g_list_append(merged_list,(gpointer)new_dk);
+        }
+    }
+else if(list2 == NULL)
+    {
+    n1 = g_list_length(list1);
+    n2 = 0;
 
-                       /* Check the total length of the merged list */
-                       if(g_list_length(merged_list) < MAX_ENCRYPTION_KEYS)
-                               merged_list = g_list_append(merged_list,(gpointer)new_dk);
-               }
-           }
-       else if(list2 == NULL)
-           {
-           n1 = g_list_length(list1);
-           n2 = 0;
+    for(i=0;i<n1;i++)
+        {
+        new_dk = (decryption_key_t*)g_malloc(sizeof(decryption_key_t));
+        dk1 = (decryption_key_t*)g_list_nth_data(list1,i);
 
-           for(i=0;i<n1;i++)
-               {
-               new_dk = (decryption_key_t*)g_malloc(sizeof(decryption_key_t));
-               dk1 = (decryption_key_t*)g_list_nth_data(list1,i);
-
-               new_dk->bits = dk1->bits;
-               new_dk->type = dk1->type;
-               new_dk->key  = g_string_new(dk1->key->str);
-               if(dk1->ssid != NULL)
-                   new_dk->ssid = g_string_new(dk1->ssid->str);
-               else
-                   new_dk->ssid = NULL;
+        new_dk->bits = dk1->bits;
+        new_dk->type = dk1->type;
+        new_dk->key  = g_string_new(dk1->key->str);
+        if(dk1->ssid != NULL)
+            new_dk->ssid = g_string_new(dk1->ssid->str);
+        else
+            new_dk->ssid = NULL;
 
-                       /* Check the total length of the merged list */
-                       if(g_list_length(merged_list) < MAX_ENCRYPTION_KEYS)
-                               merged_list = g_list_append(merged_list,(gpointer)new_dk);
-               }
-           }
-       else
-           {
-           n1 = g_list_length(list1);
-           n2 = g_list_length(list2);
+               /* Check the total length of the merged list */
+               if(g_list_length(merged_list) < MAX_ENCRYPTION_KEYS)
+                       merged_list = g_list_append(merged_list,(gpointer)new_dk);
+        }
+    }
+else
+    {
+    n1 = g_list_length(list1);
+    n2 = g_list_length(list2);
 
-           /* Copy the whole list1 into merged_list */
-           for(i=0;i<n1;i++)
-           {
-           new_dk = (decryption_key_t*)g_malloc(sizeof(decryption_key_t));
-           dk1 = (decryption_key_t *)g_list_nth_data(list1,i);
+    /* Copy the whole list1 into merged_list */
+    for(i=0;i<n1;i++)
+    {
+    new_dk = (decryption_key_t*)g_malloc(sizeof(decryption_key_t));
+    dk1 = (decryption_key_t *)g_list_nth_data(list1,i);
 
-           new_dk->bits = dk1->bits;
-           new_dk->type = dk1->type;
-           new_dk->key  = g_string_new(dk1->key->str);
+    new_dk->bits = dk1->bits;
+    new_dk->type = dk1->type;
+    new_dk->key  = g_string_new(dk1->key->str);
 
-           if(dk1->ssid != NULL)
-               new_dk->ssid = g_string_new(dk1->ssid->str);
-           else
-               new_dk->ssid = NULL;
+    if(dk1->ssid != NULL)
+        new_dk->ssid = g_string_new(dk1->ssid->str);
+    else
+        new_dk->ssid = NULL;
 
-               /* Check the total length of the merged list */
-               if(g_list_length(merged_list) < MAX_ENCRYPTION_KEYS)
-                       merged_list = g_list_append(merged_list,(gpointer)new_dk);
-           }
+       /* Check the total length of the merged list */
+       if(g_list_length(merged_list) < MAX_ENCRYPTION_KEYS)
+               merged_list = g_list_append(merged_list,(gpointer)new_dk);
+    }
 
-           /* Look for keys that are present in list2 but aren't in list1 yet...
-            * Add them to merged_list
-            */
-           for(i=0;i<n2;i++)
-               {
-               dk2 = (decryption_key_t *)g_list_nth_data(list2,i);
+    /* Look for keys that are present in list2 but aren't in list1 yet...
+     * Add them to merged_list
+     */
+    for(i=0;i<n2;i++)
+        {
+        dk2 = (decryption_key_t *)g_list_nth_data(list2,i);
 
-               if(!key_is_in_list(dk2,merged_list))
-                   {
-                   new_dk = (decryption_key_t*)g_malloc(sizeof(decryption_key_t));
-
-                   new_dk->bits = dk2->bits;
-                   new_dk->type = dk2->type;
-                   new_dk->key  = g_string_new(dk2->key->str);
-                   if(dk2->ssid != NULL)
-                       new_dk->ssid = g_string_new(dk2->ssid->str);
-                   else
-                       new_dk->ssid = NULL;
-
-                               /* Check the total length of the merged list */
-                               if(g_list_length(merged_list) < MAX_ENCRYPTION_KEYS)
-                                       merged_list = g_list_append(merged_list,(gpointer)new_dk);
-                   }
-               }
-           }
+        if(!key_is_in_list(dk2,merged_list))
+            {
+            new_dk = (decryption_key_t*)g_malloc(sizeof(decryption_key_t));
+
+            new_dk->bits = dk2->bits;
+            new_dk->type = dk2->type;
+            new_dk->key  = g_string_new(dk2->key->str);
+            if(dk2->ssid != NULL)
+                new_dk->ssid = g_string_new(dk2->ssid->str);
+            else
+                new_dk->ssid = NULL;
+
+                       /* Check the total length of the merged list */
+                       if(g_list_length(merged_list) < MAX_ENCRYPTION_KEYS)
+                               merged_list = g_list_append(merged_list,(gpointer)new_dk);
+            }
+        }
+    }
 
-       return merged_list;
+return merged_list;
 }
 
 /*
@@ -1394,34 +1986,34 @@ merge_key_list(GList* list1, GList* list2)
 void
 free_key_list(GList *list)
 {
-       guint i,n;
-       decryption_key_t *curr_key;
+guint i,n;
+decryption_key_t *curr_key;
 
-       if(list == NULL)
-           return;
+if(list == NULL)
+    return;
 
-       n = g_list_length(list);
+n = g_list_length(list);
 
-       for(i = 0; i < n; i++)
-       {
-               curr_key = (decryption_key_t*)g_list_nth_data(list,i);
+for(i = 0; i < n; i++)
+{
+curr_key = (decryption_key_t*)g_list_nth_data(list,i);
 
-               /* Free all the strings */
-               if(curr_key->key != NULL)
-                   g_string_free(curr_key->key,TRUE);
+/* Free all the strings */
+if(curr_key->key != NULL)
+    g_string_free(curr_key->key,TRUE);
 
-               if(curr_key->ssid != NULL)
-               g_string_free(curr_key->ssid,TRUE);
+if(curr_key->ssid != NULL)
+g_string_free(curr_key->ssid,TRUE);
 
-               /* free the decryption_key_t structure*/
-               g_free(curr_key);
-               curr_key = NULL;
-       }
+/* free the decryption_key_t structure*/
+g_free(curr_key);
+curr_key = NULL;
+}
 
-       /* Free the list */
-       g_list_free(list);
+/* Free the list */
+g_list_free(list);
 
-       return;
+return;
 }
 
 
@@ -1432,26 +2024,26 @@ free_key_list(GList *list)
 gboolean
 key_is_in_list(decryption_key_t *dk,GList *list)
 {
-       guint i,n;
-       decryption_key_t* curr_key = NULL;
-       gboolean found = FALSE;
+guint i,n;
+decryption_key_t* curr_key = NULL;
+gboolean found = FALSE;
 
-       if( (list == NULL) || (dk == NULL) )
-           return FALSE;
+if( (list == NULL) || (dk == NULL) )
+    return FALSE;
 
-       n = g_list_length(list);
+n = g_list_length(list);
 
-       if(n < 1)
-           return FALSE;
+if(n < 1)
+    return FALSE;
 
-       for(i = 0; i < n; i++)
-       {
-               curr_key = (decryption_key_t*)g_list_nth_data(list,i);
-               if(keys_are_equals(dk,curr_key))
-                   found = TRUE;
-       }
+for(i = 0; i < n; i++)
+{
+curr_key = (decryption_key_t*)g_list_nth_data(list,i);
+if(keys_are_equals(dk,curr_key))
+    found = TRUE;
+}
 
-       return found;
+return found;
 }
 
 /*
@@ -1460,27 +2052,28 @@ key_is_in_list(decryption_key_t *dk,GList *list)
 gboolean
 keys_are_equals(decryption_key_t *k1,decryption_key_t *k2)
 {
-       if((k1==NULL) || (k2==NULL))
-           return FALSE;
 
-       if( g_string_equal(k1->key,k2->key) &&
-           (k1->bits == k2->bits) && /* If the previous is TRUE, this must be TRUE as well */
-           k1->type == k2->type)
-           {
-           /* Check the ssid... if the key type is WEP, the two fields should be NULL */
-           if((k1->ssid == NULL) && (k2->ssid == NULL))
-               return TRUE;
+if((k1==NULL) || (k2==NULL))
+    return FALSE;
 
-           /* Check if one of them is null and one is not... */
-           if((k1->ssid == NULL) || (k2->ssid == NULL))
-               return FALSE;
+if( g_string_equal(k1->key,k2->key) &&
+    (k1->bits == k2->bits) && /* If the previous is TRUE, this must be TRUE as well */
+    k1->type == k2->type)
+    {
+    /* Check the ssid... if the key type is WEP, the two fields should be NULL */
+    if((k1->ssid == NULL) && (k2->ssid == NULL))
+        return TRUE;
 
-           /* If they are not null, they must share the same ssid */
-           return g_string_equal(k1->ssid,k2->ssid);
-           }
+    /* Check if one of them is null and one is not... */
+    if((k1->ssid == NULL) || (k2->ssid == NULL))
+        return FALSE;
 
-       /* Some field is not equal ... */
-       return FALSE;
+    /* If they are not null, they must share the same ssid */
+    return g_string_equal(k1->ssid,k2->ssid);
+    }
+
+/* Some field is not equal ... */
+return FALSE;
 }
 
 /*
@@ -1491,46 +2084,52 @@ keys_are_equals(decryption_key_t *k1,decryption_key_t *k2)
 gboolean
 key_lists_are_equal(GList* list1, GList* list2)
 {
-       guint n1=0,n2=0;
-       guint i;
-       decryption_key_t *dk1=NULL,*dk2=NULL;
+guint n1=0,n2=0;
+guint i;
+decryption_key_t *dk1=NULL,*dk2=NULL;
 
-       n1 = g_list_length(list1);
-       n2 = g_list_length(list2);
+n1 = g_list_length(list1);
+n2 = g_list_length(list2);
 
-       if(n1 != n2) return FALSE;
+/*
+ * Commented, because in the new AirPcap version all the keys will be saved
+ * into the driver, and all the keys for every specific adapter will be
+ * removed. This means that this check will always fail... and the user will
+ * always be asked what to do... and it doesn't make much sense.
+ */
+if(n1 != n2) return FALSE;
 
-       for(i=0;i<n1;i++)
-       {
-               dk1=(decryption_key_t*)g_list_nth_data(list1,i);
-               dk2=(decryption_key_t*)g_list_nth_data(list2,i);
+for(i=0;i<n1;i++)
+{
+dk1=(decryption_key_t*)g_list_nth_data(list1,i);
+dk2=(decryption_key_t*)g_list_nth_data(list2,i);
 
-               if(!g_string_equal(dk1->key,dk2->key)) return FALSE;
-       }
+if(!g_string_equal(dk1->key,dk2->key)) return FALSE;
+}
 
-       return TRUE;
+return TRUE;
 }
 
 static guint
 test_if_on(pref_t *pref, gpointer ud _U_)
 {
-       gboolean *is_on;
-       gboolean number;
+gboolean *is_on;
+gboolean number;
 
-       /* Retrieve user data info */
-       is_on = (gboolean*)ud;
+/* Retrieve user data info */
+is_on = (gboolean*)ud;
 
 
-       if (g_strncasecmp(pref->name, "enable_decryption", 17) == 0 && pref->type == PREF_BOOL)
-           {
-           number = *pref->varp.boolp;
+if (g_strncasecmp(pref->name, "enable_decryption", 17) == 0 && pref->type == PREF_BOOL)
+    {
+    number = *pref->varp.boolp;
 
-           if(number) *is_on = TRUE;
-           else *is_on = FALSE;
+    if(number) *is_on = TRUE;
+    else *is_on = FALSE;
 
-           return 1;
-           }
-       return 0;
+    return 1;
+    }
+return 0;
 }
 
 /*
@@ -1539,55 +2138,95 @@ test_if_on(pref_t *pref, gpointer ud _U_)
 gboolean
 wireshark_decryption_on()
 {
-       gboolean is_on;
+gboolean is_on;
 
-       /* Retrieve the wlan preferences */
-       wlan_prefs = prefs_find_module("wlan");
+/* Retrieve the wlan preferences */
+wlan_prefs = prefs_find_module("wlan");
 
-       /* Run the callback on each 802.11 preference */
-       prefs_pref_foreach(wlan_prefs, test_if_on, (gpointer)&is_on);
+/* Run the callback on each 802.11 preference */
+prefs_pref_foreach(wlan_prefs, test_if_on, (gpointer)&is_on);
 
-       return is_on;
+return is_on;
 }
 
 /*
- * Returns TRUE if the AirPcap decryption is active, false otherwise
+ * Returns TRUE if the AirPcap decryption for the current adapter is active, false otherwise
  */
 gboolean
 airpcap_decryption_on()
 {
-       gboolean is_on = FALSE;
+gboolean is_on = FALSE;
 
-       if(airpcap_if_selected != NULL)
-           {
-           is_on = (gboolean)airpcap_if_selected->DecryptionOn;
-           }
+airpcap_if_info_t* fake_if_info = NULL;
+
+fake_if_info = airpcap_driver_fake_if_info_new();
+
+if(fake_if_info != NULL)
+    {
+    is_on = (gboolean)fake_if_info->DecryptionOn;
+    }
 
-       return is_on;
+airpcap_if_info_free(fake_if_info);
+
+return is_on;
+}
+
+/*
+ * Free an instance of airpcap_if_info_t
+ */
+void
+airpcap_if_info_free(airpcap_if_info_t *if_info)
+{
+if(if_info != NULL)
+       {
+       if (if_info->name != NULL)
+               g_free(if_info->name);
+
+       if (if_info->description != NULL)
+               g_free(if_info->description);
+
+       if(if_info->keysCollection != NULL)
+               {
+               g_free(if_info->keysCollection);
+               if_info->keysCollection = NULL;
+               }
+
+       if(if_info->ip_addr != NULL)
+               {
+               g_slist_free(if_info->ip_addr);
+               if_info->ip_addr = NULL;
+               }
+
+       if(if_info != NULL)
+               {
+               g_free(if_info);
+               if_info = NULL;
+               }
+       }
 }
 
 static guint
 set_on_off(pref_t *pref, gpointer ud _U_)
 {
-       gboolean *is_on;
-       gboolean number;
+gboolean *is_on;
+gboolean number;
 
-       /* Retrieve user data info */
-       is_on = (gboolean*)ud;
+/* Retrieve user data info */
+is_on = (gboolean*)ud;
 
-       if (g_strncasecmp(pref->name, "enable_decryption", 17) == 0 && pref->type == PREF_BOOL)
-           {
-           number = *pref->varp.boolp;
+if (g_strncasecmp(pref->name, "enable_decryption", 17) == 0 && pref->type == PREF_BOOL)
+    {
+    number = *pref->varp.boolp;
 
-           g_free((void *)*pref->varp.boolp);
-           if(*is_on)
-               *pref->varp.boolp = TRUE;
-           else
-               *pref->varp.boolp = FALSE;
+    g_free((void *)*pref->varp.boolp);
+    if(*is_on)
+        *pref->varp.boolp = TRUE;
+    else
+        *pref->varp.boolp = FALSE;
 
-           return 1;
-           }
-       return 0;
+    return 1;
+    }
+return 0;
 }
 
 /*
@@ -1596,23 +2235,23 @@ set_on_off(pref_t *pref, gpointer ud _U_)
 void
 set_wireshark_decryption(gboolean on_off)
 {
-       gboolean is_on;
+gboolean is_on;
 
-       is_on = on_off;
+is_on = on_off;
 
-       /* Retrieve the wlan preferences */
-       wlan_prefs = prefs_find_module("wlan");
+/* Retrieve the wlan preferences */
+wlan_prefs = prefs_find_module("wlan");
 
-       /* Run the callback on each 802.11 preference */
-       prefs_pref_foreach(wlan_prefs, set_on_off, (gpointer)&is_on);
+/* Run the callback on each 802.11 preference */
+prefs_pref_foreach(wlan_prefs, set_on_off, (gpointer)&is_on);
 
-       /*
       * Signal that we've changed things, and run the 802.11 dissector's
       * callback
       */
-       wlan_prefs->prefs_changed = TRUE;
+/*
+ * Signal that we've changed things, and run the 802.11 dissector's
+ * callback
+ */
+wlan_prefs->prefs_changed = TRUE;
 
-       prefs_apply(wlan_prefs);
+prefs_apply(wlan_prefs);
 }
 
 /*
@@ -1621,19 +2260,42 @@ set_wireshark_decryption(gboolean on_off)
 gboolean
 set_airpcap_decryption(gboolean on_off)
 {
-       /* We need to directly access the .ddl functions here... */
+       /* We need to directly access the .dll functions here... */
        gchar ebuf[AIRPCAP_ERRBUF_SIZE];
-       PAirpcapHandle ad;
+       PAirpcapHandle ad,ad_driver;
 
        gboolean success = TRUE;
 
        gint n = 0;
        gint i = 0;
        airpcap_if_info_t* curr_if = NULL;
+       airpcap_if_info_t* fake_if_info = NULL;
+
+       fake_if_info = airpcap_driver_fake_if_info_new();
+
+       if(fake_if_info == NULL)
+               /* We apparently don't have any adapters installed.
+                * This isn't a failure, so return TRUE
+                */
+               return TRUE;
+
+       /* Set the driver decryption */
+       ad_driver = airpcap_if_open(fake_if_info->name, ebuf);
+       if(ad)
+               {
+               if(on_off)
+                       airpcap_if_set_driver_decryption_state(ad_driver,AIRPCAP_DECRYPTION_ON);
+               else
+                       airpcap_if_set_driver_decryption_state(ad_driver,AIRPCAP_DECRYPTION_OFF);
+
+               airpcap_if_close(ad_driver);
+               }
+
+       airpcap_if_info_free(fake_if_info);
 
        n = g_list_length(airpcap_if_list);
 
-       /* The same kind of settings should be propagated to all the adapters */
+       /* Set to FALSE the decryption for all the adapters */
        /* Apply this change to all the adapters !!! */
        for(i = 0; i < n; i++)
            {
@@ -1644,7 +2306,7 @@ set_airpcap_decryption(gboolean on_off)
                ad = airpcap_if_open(get_airpcap_name_from_description(airpcap_if_list,curr_if->description), ebuf);
                        if(ad)
                    {
-                   curr_if->DecryptionOn = (gboolean)on_off;
+                   curr_if->DecryptionOn = (gboolean)AIRPCAP_DECRYPTION_OFF;
                        airpcap_if_set_decryption_state(ad,curr_if->DecryptionOn);
                        /* Save configuration for the curr_if */
                        if(!airpcap_if_store_cur_config_as_adapter_default(ad))
@@ -1665,45 +2327,71 @@ set_airpcap_decryption(gboolean on_off)
  *  Used to dynamically load the airpcap library in order link it only when
  *  it's present on the system
  */
-BOOL load_airpcap(void)
+int load_airpcap(void)
 {
+BOOL base_functions = TRUE;
+BOOL new_functions = TRUE;
+
  if((AirpcapLib =  LoadLibrary(TEXT("airpcap.dll"))) == NULL)
  {
   /* Report the error but go on */
-  return FALSE;
+  return AIRPCAP_DLL_NOT_FOUND;
  }
  else
  {
-  if((g_PAirpcapGetLastError = (AirpcapGetLastErrorHandler) GetProcAddress(AirpcapLib, "AirpcapGetLastError")) == NULL) return FALSE;
-  if((g_PAirpcapGetDeviceList = (AirpcapGetDeviceListHandler) GetProcAddress(AirpcapLib, "AirpcapGetDeviceList")) == NULL) return FALSE;
-  if((g_PAirpcapFreeDeviceList = (AirpcapFreeDeviceListHandler) GetProcAddress(AirpcapLib, "AirpcapFreeDeviceList")) == NULL) return FALSE;
-  if((g_PAirpcapOpen = (AirpcapOpenHandler) GetProcAddress(AirpcapLib, "AirpcapOpen")) == NULL) return FALSE;
-  if((g_PAirpcapClose = (AirpcapCloseHandler) GetProcAddress(AirpcapLib, "AirpcapClose")) == NULL) return FALSE;
-  if((g_PAirpcapGetLinkType = (AirpcapGetLinkTypeHandler) GetProcAddress(AirpcapLib, "AirpcapGetLinkType")) == NULL) return FALSE;
-  if((g_PAirpcapSetLinkType = (AirpcapSetLinkTypeHandler) GetProcAddress(AirpcapLib, "AirpcapSetLinkType")) == NULL) return FALSE;
-  if((g_PAirpcapSetKernelBuffer = (AirpcapSetKernelBufferHandler) GetProcAddress(AirpcapLib, "AirpcapSetKernelBuffer")) == NULL) return FALSE;
-  if((g_PAirpcapSetFilter = (AirpcapSetFilterHandler) GetProcAddress(AirpcapLib, "AirpcapSetFilter")) == NULL) return FALSE;
-  if((g_PAirpcapGetMacAddress = (AirpcapGetMacAddressHandler) GetProcAddress(AirpcapLib, "AirpcapGetMacAddress")) == NULL) return FALSE;
-  if((g_PAirpcapSetMinToCopy = (AirpcapSetMinToCopyHandler) GetProcAddress(AirpcapLib, "AirpcapSetMinToCopy")) == NULL) return FALSE;
-  if((g_PAirpcapGetReadEvent = (AirpcapGetReadEventHandler) GetProcAddress(AirpcapLib, "AirpcapGetReadEvent")) == NULL) return FALSE;
-  if((g_PAirpcapRead = (AirpcapReadHandler) GetProcAddress(AirpcapLib, "AirpcapRead")) == NULL) return FALSE;
-  if((g_PAirpcapGetStats = (AirpcapGetStatsHandler) GetProcAddress(AirpcapLib, "AirpcapGetStats")) == NULL) return FALSE;
-  if((g_PAirpcapTurnLedOn = (AirpcapTurnLedOnHandler) GetProcAddress(AirpcapLib, "AirpcapTurnLedOn")) == NULL) return FALSE;
-  if((g_PAirpcapTurnLedOff = (AirpcapTurnLedOffHandler) GetProcAddress(AirpcapLib, "AirpcapTurnLedOff")) == NULL) return FALSE;
-  if((g_PAirpcapGetDeviceChannel = (AirpcapGetDeviceChannelHandler) GetProcAddress(AirpcapLib, "AirpcapGetDeviceChannel")) == NULL) return FALSE;
-  if((g_PAirpcapSetDeviceChannel = (AirpcapSetDeviceChannelHandler) GetProcAddress(AirpcapLib, "AirpcapSetDeviceChannel")) == NULL) return FALSE;
-  if((g_PAirpcapGetFcsPresence = (AirpcapGetFcsPresenceHandler) GetProcAddress(AirpcapLib, "AirpcapGetFcsPresence")) == NULL) return FALSE;
-  if((g_PAirpcapSetFcsPresence = (AirpcapSetFcsPresenceHandler) GetProcAddress(AirpcapLib, "AirpcapSetFcsPresence")) == NULL) return FALSE;
-  if((g_PAirpcapGetFcsValidation = (AirpcapGetFcsValidationHandler) GetProcAddress(AirpcapLib, "AirpcapGetFcsValidation")) == NULL) return FALSE;
-  if((g_PAirpcapSetFcsValidation = (AirpcapSetFcsValidationHandler) GetProcAddress(AirpcapLib, "AirpcapSetFcsValidation")) == NULL) return FALSE;
-  if((g_PAirpcapGetDeviceKeys = (AirpcapGetDeviceKeysHandler) GetProcAddress(AirpcapLib, "AirpcapGetDeviceKeys")) == NULL) return FALSE;
-  if((g_PAirpcapSetDeviceKeys = (AirpcapSetDeviceKeysHandler) GetProcAddress(AirpcapLib, "AirpcapSetDeviceKeys")) == NULL) return FALSE;
-  if((g_PAirpcapGetDecryptionState = (AirpcapGetDecryptionStateHandler) GetProcAddress(AirpcapLib, "AirpcapGetDecryptionState")) == NULL) return FALSE;
-  if((g_PAirpcapSetDecryptionState = (AirpcapSetDecryptionStateHandler) GetProcAddress(AirpcapLib, "AirpcapSetDecryptionState")) == NULL) return FALSE;
-  if((g_PAirpcapStoreCurConfigAsAdapterDefault = (AirpcapStoreCurConfigAsAdapterDefaultHandler) GetProcAddress(AirpcapLib, "AirpcapStoreCurConfigAsAdapterDefault")) == NULL) return FALSE;
-  if((g_PAirpcapGetVersion = (AirpcapGetVersionHandler) GetProcAddress(AirpcapLib, "AirpcapGetVersion")) == NULL) return FALSE;
-  AirpcapLoaded = TRUE;
-  return TRUE;
+  if((g_PAirpcapGetLastError = (AirpcapGetLastErrorHandler) GetProcAddress(AirpcapLib, "AirpcapGetLastError")) == NULL) base_functions = FALSE;
+  if((g_PAirpcapGetDeviceList = (AirpcapGetDeviceListHandler) GetProcAddress(AirpcapLib, "AirpcapGetDeviceList")) == NULL) base_functions = FALSE;
+  if((g_PAirpcapFreeDeviceList = (AirpcapFreeDeviceListHandler) GetProcAddress(AirpcapLib, "AirpcapFreeDeviceList")) == NULL) base_functions = FALSE;
+  if((g_PAirpcapOpen = (AirpcapOpenHandler) GetProcAddress(AirpcapLib, "AirpcapOpen")) == NULL) base_functions = FALSE;
+  if((g_PAirpcapClose = (AirpcapCloseHandler) GetProcAddress(AirpcapLib, "AirpcapClose")) == NULL) base_functions = FALSE;
+  if((g_PAirpcapGetLinkType = (AirpcapGetLinkTypeHandler) GetProcAddress(AirpcapLib, "AirpcapGetLinkType")) == NULL) base_functions = FALSE;
+  if((g_PAirpcapSetLinkType = (AirpcapSetLinkTypeHandler) GetProcAddress(AirpcapLib, "AirpcapSetLinkType")) == NULL) base_functions = FALSE;
+  if((g_PAirpcapSetKernelBuffer = (AirpcapSetKernelBufferHandler) GetProcAddress(AirpcapLib, "AirpcapSetKernelBuffer")) == NULL) base_functions = FALSE;
+  if((g_PAirpcapSetFilter = (AirpcapSetFilterHandler) GetProcAddress(AirpcapLib, "AirpcapSetFilter")) == NULL) base_functions = FALSE;
+  if((g_PAirpcapGetMacAddress = (AirpcapGetMacAddressHandler) GetProcAddress(AirpcapLib, "AirpcapGetMacAddress")) == NULL) base_functions = FALSE;
+  if((g_PAirpcapSetMinToCopy = (AirpcapSetMinToCopyHandler) GetProcAddress(AirpcapLib, "AirpcapSetMinToCopy")) == NULL) base_functions = FALSE;
+  if((g_PAirpcapGetReadEvent = (AirpcapGetReadEventHandler) GetProcAddress(AirpcapLib, "AirpcapGetReadEvent")) == NULL) base_functions = FALSE;
+  if((g_PAirpcapRead = (AirpcapReadHandler) GetProcAddress(AirpcapLib, "AirpcapRead")) == NULL) base_functions = FALSE;
+  if((g_PAirpcapGetStats = (AirpcapGetStatsHandler) GetProcAddress(AirpcapLib, "AirpcapGetStats")) == NULL) base_functions = FALSE;
+  if((g_PAirpcapTurnLedOn = (AirpcapTurnLedOnHandler) GetProcAddress(AirpcapLib, "AirpcapTurnLedOn")) == NULL) base_functions = FALSE;
+  if((g_PAirpcapTurnLedOff = (AirpcapTurnLedOffHandler) GetProcAddress(AirpcapLib, "AirpcapTurnLedOff")) == NULL) base_functions = FALSE;
+  if((g_PAirpcapGetDeviceChannel = (AirpcapGetDeviceChannelHandler) GetProcAddress(AirpcapLib, "AirpcapGetDeviceChannel")) == NULL) base_functions = FALSE;
+  if((g_PAirpcapSetDeviceChannel = (AirpcapSetDeviceChannelHandler) GetProcAddress(AirpcapLib, "AirpcapSetDeviceChannel")) == NULL) base_functions = FALSE;
+  if((g_PAirpcapGetFcsPresence = (AirpcapGetFcsPresenceHandler) GetProcAddress(AirpcapLib, "AirpcapGetFcsPresence")) == NULL) base_functions = FALSE;
+  if((g_PAirpcapSetFcsPresence = (AirpcapSetFcsPresenceHandler) GetProcAddress(AirpcapLib, "AirpcapSetFcsPresence")) == NULL) base_functions = FALSE;
+  if((g_PAirpcapGetFcsValidation = (AirpcapGetFcsValidationHandler) GetProcAddress(AirpcapLib, "AirpcapGetFcsValidation")) == NULL) base_functions = FALSE;
+  if((g_PAirpcapSetFcsValidation = (AirpcapSetFcsValidationHandler) GetProcAddress(AirpcapLib, "AirpcapSetFcsValidation")) == NULL) base_functions = FALSE;
+  if((g_PAirpcapGetDeviceKeys = (AirpcapGetDeviceKeysHandler) GetProcAddress(AirpcapLib, "AirpcapGetDeviceKeys")) == NULL) base_functions = FALSE;
+  if((g_PAirpcapSetDeviceKeys = (AirpcapSetDeviceKeysHandler) GetProcAddress(AirpcapLib, "AirpcapSetDeviceKeys")) == NULL) base_functions = FALSE;
+  if((g_PAirpcapGetDecryptionState = (AirpcapGetDecryptionStateHandler) GetProcAddress(AirpcapLib, "AirpcapGetDecryptionState")) == NULL) base_functions = FALSE;
+  if((g_PAirpcapSetDecryptionState = (AirpcapSetDecryptionStateHandler) GetProcAddress(AirpcapLib, "AirpcapSetDecryptionState")) == NULL) base_functions = FALSE;
+  if((g_PAirpcapStoreCurConfigAsAdapterDefault = (AirpcapStoreCurConfigAsAdapterDefaultHandler) GetProcAddress(AirpcapLib, "AirpcapStoreCurConfigAsAdapterDefault")) == NULL) base_functions = FALSE;
+  if((g_PAirpcapGetVersion = (AirpcapGetVersionHandler) GetProcAddress(AirpcapLib, "AirpcapGetVersion")) == NULL) base_functions = FALSE;
+
+  /* TEST IF WE CAN FIND AIRPCAP NEW DRIVER FEATURES */
+  if((g_PAirpcapGetDriverDecryptionState = (AirpcapGetDriverDecryptionStateHandler) GetProcAddress(AirpcapLib, "AirpcapGetDriverDecryptionState")) == NULL) new_functions = FALSE;
+  if((g_PAirpcapSetDriverDecryptionState = (AirpcapSetDriverDecryptionStateHandler) GetProcAddress(AirpcapLib, "AirpcapSetDriverDecryptionState")) == NULL) new_functions = FALSE;
+  if((g_PAirpcapGetDriverKeys = (AirpcapGetDriverKeysHandler) GetProcAddress(AirpcapLib, "AirpcapGetDriverKeys")) == NULL) new_functions = FALSE;
+  if((g_PAirpcapSetDriverKeys = (AirpcapSetDriverKeysHandler) GetProcAddress(AirpcapLib, "AirpcapSetDriverKeys")) == NULL) new_functions = FALSE;
+
+  if(base_functions)
+  {
+         if(new_functions)
+         {
+         AirpcapLoaded = TRUE;
+         return AIRPCAP_DLL_OK;
+         }
+         else
+         {
+         AirpcapLoaded = TRUE;
+         return AIRPCAP_DLL_OLD;
+         }
+  }
+  else
+  {
+         AirpcapLoaded = FALSE;
+         return AIRPCAP_DLL_ERROR;
+  }
  }
 }
 
index 3a053a8a2dc3a1a8d3057c471610e6f7d0e5d2c4..5260fe0403dbbcce78fc2337f8dcad20422ed9c3 100644 (file)
 #define AIRPCAP_WPA_KEY_STRING  "WPA"
 #define AIRPCAP_WPA2_KEY_STRING "WPA2"
 
+#define AIRPCAP_DLL_OK                 0
+#define AIRPCAP_DLL_OLD                        1
+#define AIRPCAP_DLL_ERROR              2
+#define AIRPCAP_DLL_NOT_FOUND  3
+
 typedef PCHAR (*AirpcapGetLastErrorHandler)(PAirpcapHandle AdapterHandle);
 typedef BOOL (*AirpcapGetDeviceListHandler)(PAirpcapDeviceDescription *PPAllDevs, PCHAR Ebuf);
 typedef VOID (*AirpcapFreeDeviceListHandler)(PAirpcapDeviceDescription PAllDevs);
@@ -73,10 +78,15 @@ typedef BOOL (*AirpcapSetFcsValidationHandler)(PAirpcapHandle  AdapterHandle, Ai
 typedef BOOL (*AirpcapGetFcsValidationHandler)(PAirpcapHandle  AdapterHandle, PAirpcapValidationType PValidationType);
 typedef BOOL (*AirpcapSetDeviceKeysHandler)(PAirpcapHandle AdapterHandle, PAirpcapKeysCollection KeysCollection);
 typedef BOOL (*AirpcapGetDeviceKeysHandler)(PAirpcapHandle AdapterHandle, PAirpcapKeysCollection KeysCollection, PUINT PKeysCollectionSize);
+typedef BOOL (*AirpcapSetDriverKeysHandler)(PAirpcapHandle AdapterHandle, PAirpcapKeysCollection KeysCollection);
+typedef BOOL (*AirpcapGetDriverKeysHandler)(PAirpcapHandle AdapterHandle, PAirpcapKeysCollection KeysCollection, PUINT PKeysCollectionSize);
 typedef BOOL (*AirpcapSetDecryptionStateHandler)(PAirpcapHandle AdapterHandle, AirpcapDecryptionState Enable);
 typedef BOOL (*AirpcapGetDecryptionStateHandler)(PAirpcapHandle AdapterHandle, PAirpcapDecryptionState PEnable);
+typedef BOOL (*AirpcapSetDriverDecryptionStateHandler)(PAirpcapHandle AdapterHandle, AirpcapDecryptionState Enable);
+typedef BOOL (*AirpcapGetDriverDecryptionStateHandler)(PAirpcapHandle AdapterHandle, PAirpcapDecryptionState PEnable);
 typedef BOOL (*AirpcapStoreCurConfigAsAdapterDefaultHandler)(PAirpcapHandle AdapterHandle);
 typedef VOID (*AirpcapGetVersionHandler)(PUINT VersionMajor, PUINT VersionMinor, PUINT VersionRev, PUINT VersionBuild);
+
 /*
  * The list of interfaces returned by "get_airpcap_interface_list()" is
  * a list of these structures.
@@ -137,6 +147,13 @@ extern airpcap_if_info_t *airpcap_if_active;
 BOOL
 load_wlan_wep_keys(airpcap_if_info_t* info_if);
 
+/*
+ * Function used to read the Decryption Keys from the preferences and store them
+ * properly into the airpcap adapter.
+ */
+BOOL
+load_wlan_driver_wep_keys();
+
 /*
  *  Function used to save to the prefereces file the Decryption Keys.
  */
@@ -160,6 +177,12 @@ wep_key_is_valid(char* key);
 static void
 free_airpcap_if_cb(gpointer data, gpointer user_data _U_);
 
+/*
+ * USED FOR DEBUG ONLY... PRINTS AN AirPcap ADAPTER STRUCTURE in a fancy way.
+ */
+void
+airpcap_if_info_print(airpcap_if_info_t* if_info);
+
 /*
  * Used to retrieve the two chars string from interface
  */
@@ -190,12 +213,24 @@ airpcap_if_store_cur_config_as_adapter_default(PAirpcapHandle ah);
 BOOL
 airpcap_if_load_keys(PAirpcapHandle ad, airpcap_if_info_t *if_info);
 
+/*
+ * Function used to load the WEP keys from the global driver list
+ */
+BOOL
+airpcap_if_load_driver_keys(PAirpcapHandle ad, airpcap_if_info_t *if_info);
+
 /*
  * Function used to save the WEP keys for a selected interface
  */
 void
 airpcap_if_save_keys(PAirpcapHandle ad, airpcap_if_info_t *if_info);
 
+/*
+ * Function used to save the WEP keys for a selected interface
+ */
+void
+airpcap_if_save_driver_keys(PAirpcapHandle ad, airpcap_if_info_t *if_info);
+
 /*
  * Airpcap wrapper, used to get the fcs validation of an airpcap adapter
  */
@@ -281,11 +316,16 @@ BOOL airpcap_if_turn_led_off(PAirpcapHandle AdapterHandle, UINT LedNumber);
  */
 airpcap_if_info_t* airpcap_if_info_new(char *name, char *description);
 
+/*
+ * This function will create a new fake drivers' interface, to load global keys...
+ */
+airpcap_if_info_t* airpcap_driver_fake_if_info_new();
+
 /*
  *  Used to dinamically load the airpcap library in order link it only when
  *  it's present on the system.
  */
-BOOL load_airpcap(void);
+int load_airpcap(void);
 
 /*
  * Get an error message string for a CANT_GET_INTERFACE_LIST error from
@@ -357,6 +397,66 @@ airpcap_if_set_device_keys(PAirpcapHandle AdapterHandle, PAirpcapKeysCollection
 BOOL
 airpcap_if_get_device_keys(PAirpcapHandle AdapterHandle, PAirpcapKeysCollection KeysCollection, PUINT PKeysCollectionSize);
 
+/*
+ * Airpcap wrapper, used to save the settings for the selected_if
+ */
+BOOL
+airpcap_if_set_driver_keys(PAirpcapHandle AdapterHandle, PAirpcapKeysCollection KeysCollection);
+
+/*
+ * Airpcap wrapper, used to save the settings for the selected_if
+ */
+BOOL
+airpcap_if_get_driver_keys(PAirpcapHandle AdapterHandle, PAirpcapKeysCollection KeysCollection, PUINT PKeysCollectionSize);
+
+/*
+ * Airpcap wrapper, used to get the decryption enabling of an airpcap driver
+ */
+BOOL
+airpcap_if_get_driver_decryption_state(PAirpcapHandle ah, PAirpcapDecryptionState PEnable);
+/*
+ * Airpcap wrapper, used to set the decryption enabling of an airpcap driver
+ */
+BOOL
+airpcap_if_set_driver_decryption_state(PAirpcapHandle ah, AirpcapDecryptionState Enable);
+
+/*
+ * Save the configuration for the specified interface
+ */
+void
+airpcap_save_driver_if_configuration(airpcap_if_info_t* fake_if_info);
+
+/*
+ * Free an instance of airpcap_if_info_t
+ */
+void
+airpcap_if_info_free(airpcap_if_info_t *if_info);
+
+/*
+ * This function will tell the airpcap driver the key list to use
+ * This will be stored into the registry...
+ */
+BOOL
+write_wlan_driver_wep_keys_to_regitry(GList* key_list);
+
+/*
+ * Clear keys and decryption status for the specified interface
+ */
+void
+airpcap_if_clear_decryption_settings(airpcap_if_info_t* info_if);
+
+/* 
+ *  Function used to save to the preference file the Decryption Keys.
+ */
+int
+save_wlan_driver_wep_keys();
+
+/* 
+ *  Function used to save to the preference file the Decryption Keys.
+ */
+int
+save_wlan_wireshark_wep_keys(GList* key_ls);
+
 /*
  * DECRYPTION KEYS FUNCTIONS
  */
@@ -373,6 +473,13 @@ print_key_list(GList* key_list);
 GList*
 get_airpcap_device_keys(airpcap_if_info_t* if_info);
 
+/*
+ * Retrieves a GList of decryption_key_t structures containing infos about the
+ * keys for the global AirPcap driver... returns NULL if no keys are found.
+ */
+GList*
+get_airpcap_driver_keys();
+
 /*
  * Returns the list of the decryption keys specified for wireshark, NULL if
  * no key is found
@@ -414,13 +521,13 @@ void
 free_key_list(GList *list);
 
 /*
- * Returns TRUE if the Wireshark decryption is active, false otherwise
+ * Returns TRUE if the Wireshark decryption is active, FALSE otherwise
  */
 gboolean
 wireshark_decryption_on();
 
 /*
- * Returns TRUE if the AirPcap decryption is active, false otherwise
+ * Returns TRUE if the AirPcap decryption for the current adapter is active, FALSE otherwise
  */
 gboolean
 airpcap_decryption_on();
index eee578ca5c6f05c7315cb556668ce89cecab8d2f..3744530c8b8862b14592a1567fc4ebfbdf59abb0 100644 (file)
@@ -80,7 +80,7 @@ about_wireshark(GtkWidget *parent, GtkWidget *main_vb, const char *title)
 }
 
 
-GtkWidget *
+GtkWidget*
 splash_new(char *message)
 {
     GtkWidget *win;
index dba152df71ba54da0b3c0bae33719d88236275c9..ecde5677af6fd5dfc6bb0e709e69bf974490136f 100644 (file)
@@ -558,7 +558,7 @@ airpcap_change_if(GtkWidget *entry _U_, gpointer data)
        /* Remove old keys */
        gtk_list_remove_items(GTK_LIST(key_ls),GTK_LIST(key_ls)->children);
        /* Add new keys */
-       airpcap_fill_key_list(key_ls,airpcap_if_selected);
+       airpcap_fill_key_list(key_ls);
 
        /* Enable the signals again */
        block_advanced_signals = FALSE;
@@ -1831,7 +1831,6 @@ cf_redissect_packets(&cfile);
 void
 update_decryption_mode_cm(GtkWidget *w)
 {
-
 /* Wireshark decryption is on */                       
 if(wireshark_decryption_on())
     {
@@ -2508,6 +2507,7 @@ airpcap_if_selected = airpcap_if_active;
 /* Create the new window */
 key_management_w = window_new(GTK_WINDOW_TOPLEVEL, "Decryption Keys Management");
 
+
 gtk_container_set_border_width (GTK_CONTAINER (key_management_w), 5);
 gtk_window_set_title (GTK_WINDOW (key_management_w),
                "Decryption Keys Management");
@@ -2606,8 +2606,6 @@ key_ls = gtk_clist_new (3);
 gtk_widget_set_name (key_ls, "key_ls");
 gtk_widget_show (key_ls);
 
-airpcap_fill_key_list(key_ls,airpcap_if_selected);
-
 gtk_container_add (GTK_CONTAINER (keys_scrolled_w), key_ls);
 gtk_clist_set_column_width (GTK_CLIST (key_ls), 0, 54);
 gtk_clist_set_column_width (GTK_CLIST (key_ls), 1, 113);
@@ -2756,6 +2754,7 @@ OBJECT_SET_DATA (key_management_w, AIRPCAP_ADVANCED_CANCEL_KEY, cancel_bt);
 OBJECT_SET_DATA(key_management_w,AIRPCAP_TOOLBAR_KEY,toolbar);
 OBJECT_SET_DATA (key_management_w, AIRPCAP_TOOLBAR_DECRYPTION_KEY, toolbar_decryption_ck);
 
+/* FIRST OF ALL, CHECK THE KEY COLLECTIONS */
 /* 
  * This will read the decryption keys from the preferences file, and will store 
  * them into the registry... 
@@ -2768,9 +2767,10 @@ if(!airpcap_check_decryption_keys(airpcap_if_list))
 else /* Keys from lists are equals, or wireshark has got no keys */
     {
     airpcap_load_decryption_keys(airpcap_if_list);
+       airpcap_fill_key_list(key_ls);
     /* At the end, so that it appears completely all together ... */
-    gtk_widget_show (key_management_w);    
-    }
+       gtk_widget_show (key_management_w); 
+       }
 }
 
 /*
@@ -3102,6 +3102,7 @@ on_keys_check_cancel_bt_clicked (GtkWidget *button, gpointer user_data)
 {
 GtkWidget *key_management_w;
 GtkWidget *keys_check_w;
+GtkWidget *key_ls;
 
 keys_check_w = GTK_WIDGET(user_data);
 
@@ -3109,11 +3110,13 @@ key_management_w = OBJECT_GET_DATA(keys_check_w,AIRPCAP_CHECK_WINDOW_KEY);
 
 /* w may be NULL if airpcap_keys_check_w() has been called while wireshark was loading, 
    and is not NULL if it was called when the Key Management widget has been clicked */
-  if(key_management_w != NULL)
-     {
-     /*  ... */
-     gtk_widget_show (key_management_w);
-     }
+if(key_management_w != NULL)
+    {
+    /*  ... */
+       key_ls = OBJECT_GET_DATA(key_management_w,AIRPCAP_ADVANCED_KEYLIST_KEY);
+       airpcap_fill_key_list(key_ls);
+    gtk_widget_show (key_management_w);
+    }
 
 gtk_widget_destroy(keys_check_w);
 }
@@ -3157,22 +3160,53 @@ on_keep_bt_clicked (GtkWidget *button, gpointer user_data)
 {
 GtkWidget *key_management_w;
 GtkWidget *keys_check_w;
+GtkWidget *key_ls=NULL;
+
+GList* wireshark_keys=NULL;
+guint n_wireshark_keys = 0;
+
+GList* merged_keys=NULL;
+guint n_merged_keys = 0;
+
+guint n_adapters=0;
+guint n_total_keys=0;
 
 keys_check_w = GTK_WIDGET(user_data);
 
 key_management_w = OBJECT_GET_DATA(keys_check_w,AIRPCAP_CHECK_WINDOW_KEY);
 
-/* w may be NULL if airpcap_keys_check_w() has been called while wireshark was loading, 
-   and is not NULL if it was called when the Key Management widget has been clicked */
-  if(key_management_w != NULL)
-     {
-     /*  ... */
-     gtk_widget_show (key_management_w);
-     }
+n_adapters = g_list_length(airpcap_if_list);
 
+/* Retrieve Wireshark keys */
+wireshark_keys = get_wireshark_keys();
+n_wireshark_keys = g_list_length(wireshark_keys);
+n_total_keys += n_wireshark_keys;
+
+merged_keys = merge_key_list(wireshark_keys,NULL);
+n_merged_keys = g_list_length(merged_keys);
+
+/* Set up this new list as default for Wireshark and Adapters... */
+airpcap_save_decryption_keys(merged_keys,airpcap_if_list);
+
+/* Write the preferences to the preferences file (here is not needed, by the way)*/
+write_prefs_to_file();
+
+/* Free the memory */
+free_key_list(wireshark_keys);
+free_key_list(merged_keys);
+
+/* Close the window */
 gtk_widget_destroy(keys_check_w);
 
-airpcap_load_decryption_keys(airpcap_if_list);
+/* w may be NULL if airpcap_keys_check_w() has been called while wireshark was loading, 
+   and is not NULL if it was called when the Key Management widget has been clicked */
+if(key_management_w != NULL)
+    {
+    /*  ... */
+       key_ls = OBJECT_GET_DATA(key_management_w,AIRPCAP_ADVANCED_KEYLIST_KEY);
+       airpcap_fill_key_list(key_ls);
+    gtk_widget_show (key_management_w);
+    }
 }
 
 void
@@ -3180,15 +3214,18 @@ on_merge_bt_clicked (GtkWidget * button, gpointer user_data)
 {
 GtkWidget *key_management_w;
 GtkWidget *keys_check_w;
+GtkWidget *key_ls;
 
 guint n_adapters = 0;
 guint n_wireshark_keys = 0;
+guint n_driver_keys = 0;
 guint n_curr_adapter_keys = 0;
 guint n_total_keys = 0;
 guint n_merged_keys = 0;
 guint i = 0;
 
 GList* wireshark_keys=NULL;
+GList* driver_keys=NULL;
 GList* current_adapter_keys=NULL;
 GList* merged_list = NULL;
 GList* merged_list_tmp = NULL;
@@ -3199,24 +3236,23 @@ keys_check_w = GTK_WIDGET(user_data);
 
 key_management_w = OBJECT_GET_DATA(keys_check_w,AIRPCAP_CHECK_WINDOW_KEY);
 
-
-/* w may be NULL if airpcap_keys_check_w() has been called while wireshark was loading, 
-   and is not NULL if it was called when the Key Management widget has been clicked */
-if(key_management_w != NULL)
-    {
-    /*  ... */
-    gtk_widget_show (key_management_w);
-    }
-
 n_adapters = g_list_length(airpcap_if_list);
 
+/* Retrieve Wireshark keys */
 wireshark_keys = get_wireshark_keys();
 n_wireshark_keys = g_list_length(wireshark_keys);
 n_total_keys += n_wireshark_keys;
 
 merged_list = merge_key_list(wireshark_keys,NULL);
 
-/* NOW wireshark_keys IS no more needed... at the end, we will have to free it! */
+/* Retrieve AirPcap driver's keys */
+driver_keys = get_airpcap_driver_keys();
+n_driver_keys = g_list_length(driver_keys);
+n_total_keys += n_driver_keys;
+
+merged_list = merge_key_list(merged_list,driver_keys);
+
+/* NOW wireshark_keys and driver_keys ARE no more needed... at the end, we will have to free them! */
 for(i = 0; i<n_adapters; i++)
     {
     curr_adapter = (airpcap_if_info_t*)g_list_nth_data(airpcap_if_list,i);
@@ -3239,8 +3275,19 @@ airpcap_save_decryption_keys(merged_list,airpcap_if_list);
 write_prefs_to_file();
 
 free_key_list(wireshark_keys);
+free_key_list(driver_keys);
 
 gtk_widget_destroy(keys_check_w);
+
+/* w may be NULL if airpcap_keys_check_w() has been called while wireshark was loading, 
+   and is not NULL if it was called when the Key Management widget has been clicked */
+if(key_management_w != NULL)
+    {
+    /*  ... */
+       key_ls = OBJECT_GET_DATA(key_management_w,AIRPCAP_ADVANCED_KEYLIST_KEY);
+       airpcap_fill_key_list(key_ls);
+    gtk_widget_show (key_management_w);
+    }
 }
 
 
@@ -3249,15 +3296,18 @@ on_import_bt_clicked (GtkWidget * button, gpointer user_data)
 {
 GtkWidget *key_management_w;
 GtkWidget *keys_check_w;
+GtkWidget *key_ls;
 
 guint n_adapters = 0;
 guint n_wireshark_keys = 0;
+guint n_driver_keys = 0;
 guint n_curr_adapter_keys = 0;
 guint n_total_keys = 0;
 guint n_merged_keys = 0;
 guint i = 0;
 
 GList* wireshark_keys=NULL;
+GList* driver_keys=NULL;
 GList* current_adapter_keys=NULL;
 GList* merged_list = NULL;
 GList* merged_list_tmp = NULL;
@@ -3268,21 +3318,19 @@ keys_check_w = GTK_WIDGET(user_data);
 
 key_management_w = OBJECT_GET_DATA(keys_check_w,AIRPCAP_CHECK_WINDOW_KEY);
 
-
-/* w may be NULL if airpcap_keys_check_w() has been called while wireshark was loading, 
-   and is not NULL if it was called when the Key Management widget has been clicked */
-if(key_management_w != NULL)
-    {
-    /*  ... */
-    gtk_widget_show (key_management_w);
-    }
-
 n_adapters = g_list_length(airpcap_if_list);
 
 wireshark_keys = get_wireshark_keys();
 n_wireshark_keys = g_list_length(wireshark_keys);
 n_total_keys += n_wireshark_keys;
 
+/* Retrieve AirPcap driver's keys */
+driver_keys = get_airpcap_driver_keys();
+n_driver_keys = g_list_length(driver_keys);
+n_total_keys += n_driver_keys;
+
+merged_list = merge_key_list(merged_list,driver_keys);
+
 /* NOW wireshark_keys IS no more needed... at the end, we will have to free it! */
 for(i = 0; i<n_adapters; i++)
     {
@@ -3306,8 +3354,19 @@ airpcap_save_decryption_keys(merged_list,airpcap_if_list);
 write_prefs_to_file();
 
 free_key_list(wireshark_keys);
+free_key_list(driver_keys);
 
 gtk_widget_destroy(keys_check_w);
+
+/* w may be NULL if airpcap_keys_check_w() has been called while wireshark was loading, 
+   and is not NULL if it was called when the Key Management widget has been clicked */
+if(key_management_w != NULL)
+    {
+    /*  ... */
+       key_ls = OBJECT_GET_DATA(key_management_w,AIRPCAP_ADVANCED_KEYLIST_KEY);
+       airpcap_fill_key_list(key_ls);
+    gtk_widget_show (key_management_w);
+    }
 }
 
 
@@ -3316,6 +3375,7 @@ on_ignore_bt_clicked (GtkWidget * button, gpointer user_data)
 {
 GtkWidget *key_management_w;
 GtkWidget *keys_check_w;
+GtkWidget *key_ls;
 
 keys_check_w = GTK_WIDGET(user_data);
 
@@ -3323,11 +3383,13 @@ key_management_w = OBJECT_GET_DATA(keys_check_w,AIRPCAP_CHECK_WINDOW_KEY);
 
 /* w may be NULL if airpcap_keys_check_w() has been called while wireshark was loading, 
    and is not NULL if it was called when the Key Management widget has been clicked */
-  if(key_management_w != NULL)
-     {
-     /*  ... */
-     gtk_widget_show (key_management_w);
-     }
+if(key_management_w != NULL)
+    {
+    /*  ... */
+       key_ls = OBJECT_GET_DATA(key_management_w,AIRPCAP_ADVANCED_KEYLIST_KEY);
+       airpcap_fill_key_list(key_ls);
+    gtk_widget_show (key_management_w);
+    }
 
 gtk_widget_destroy(keys_check_w);
 }
index 19f1a87cc640d86543939e8e6db67eaa0657fe48..20c6e47ce07a84697e445fa44771902e7dcd2854 100755 (executable)
@@ -274,35 +274,41 @@ g_free(new_row[2]);
  * Fill the list with the keys
  */
 void
-airpcap_fill_key_list(GtkWidget *keylist,airpcap_if_info_t* if_info)
+airpcap_fill_key_list(GtkWidget *keylist)
 {
 gchar*          s;
 unsigned int i,n;
 gchar*       new_row[3];
+airpcap_if_info_t* fake_if_info;
+GList*          wireshark_key_list=NULL;
+decryption_key_t* curr_key = NULL;
 
 n = 0;
 
-       if( (if_info != NULL) && (if_info->keysCollection != NULL))
+fake_if_info = airpcap_driver_fake_if_info_new();
+       
+       /* We can retrieve the driver's key list (i.e. we have the right .dll)*/
+       if( (fake_if_info != NULL) && (fake_if_info->keysCollection != NULL))
                {
-        n = if_info->keysCollection->nKeys;
-               for(i = 0; i < if_info->keysCollection->nKeys; i++)
+        n = fake_if_info->keysCollection->nKeys;
+               for(i = 0; i < n; i++)
                        {
-                       s = airpcap_get_key_string(if_info->keysCollection->Keys[i]);
+                       s = airpcap_get_key_string(fake_if_info->keysCollection->Keys[i]);
                        
-                       if(if_info->keysCollection->Keys[i].KeyType == AIRPCAP_KEYTYPE_WEP)
+                       if(fake_if_info->keysCollection->Keys[i].KeyType == AIRPCAP_KEYTYPE_WEP)
                        {
             new_row[0] = g_strdup(AIRPCAP_WEP_KEY_STRING);
                        new_row[1] = g_strdup(s);
                        new_row[2] = g_strdup("");
             }
-            else if(if_info->keysCollection->Keys[i].KeyType == AIRPCAP_KEYTYPE_TKIP)
+            else if(fake_if_info->keysCollection->Keys[i].KeyType == AIRPCAP_KEYTYPE_TKIP)
             {
             new_row[0] = g_strdup(AIRPCAP_WPA_KEY_STRING);
                        new_row[1] = g_strdup(s);
                        /* XXX - Put here the SSID */
                        new_row[2] = g_strdup("");     
             }
-            else if(if_info->keysCollection->Keys[i].KeyType == AIRPCAP_KEYTYPE_CCMP)
+            else if(fake_if_info->keysCollection->Keys[i].KeyType == AIRPCAP_KEYTYPE_CCMP)
             {
             new_row[0] = g_strdup(AIRPCAP_WPA2_KEY_STRING);
                        new_row[1] = g_strdup(s);
@@ -326,6 +332,32 @@ n = 0;
                        g_free(s);
                        }
                }
+       else
+               {
+               wireshark_key_list = get_wireshark_keys();
+               n = g_list_length(wireshark_key_list);
+               
+               for(i = 0; i < n; i++)
+                       {
+                       curr_key = (decryption_key_t*)g_list_nth_data(wireshark_key_list,i);
+                       s = g_strdup(curr_key->key->str);
+                       
+            new_row[0] = g_strdup(AIRPCAP_WEP_KEY_STRING);
+                       new_row[1] = g_strdup(s);
+                       new_row[2] = g_strdup("");
+
+                       gtk_clist_append(GTK_CLIST(keylist),new_row);
+                       
+                       g_free(new_row[0]);
+                       g_free(new_row[1]);
+                       g_free(new_row[2]);
+                       
+                       g_free(s);
+                       }
+               }
+
+airpcap_if_info_free(fake_if_info);
+return;
 }
 
 /*
@@ -575,7 +607,7 @@ KeysCollectionSize = sizeof(AirpcapKeysCollection) + keys_in_list * sizeof(Airpc
 /*
  * Allocate the collection
  */
-KeysCollection = (PAirpcapKeysCollection)malloc(KeysCollectionSize);
+KeysCollection = (PAirpcapKeysCollection)g_malloc(KeysCollectionSize);
 if(!KeysCollection)
 {
        /* Simple dialog ERROR */
@@ -633,6 +665,104 @@ airpcap_if_selected->keysCollectionSize = KeysCollectionSize;
 return;
 }
 
+/*
+ * Takes the keys from the GtkList widget, and add them to the interface list
+ */
+void
+airpcap_add_keys_to_driver_from_list(GtkWidget *key_ls,airpcap_if_info_t *fake_if_info)
+{
+GString                *new_key;
+
+gchar          *text_entered = NULL;
+
+/* airpcap stuff */
+UINT i, j;
+gchar s[3];
+PAirpcapKeysCollection KeysCollection;
+ULONG KeysCollectionSize;
+UCHAR KeyByte;
+
+UINT keys_in_list = 0;
+
+gchar *row_type,
+      *row_key,
+      *row_ssid;
+
+if(fake_if_info == NULL)
+       return;
+
+keys_in_list = GTK_CLIST(key_ls)->rows;
+
+/*
+ * Save the encryption keys, if we have any of them
+ */
+KeysCollectionSize = 0;
+
+/*
+ * Calculate the size of the keys collection
+ */
+KeysCollectionSize = sizeof(AirpcapKeysCollection) + keys_in_list * sizeof(AirpcapKey);
+
+/*
+ * Allocate the collection
+ */
+KeysCollection = (PAirpcapKeysCollection)g_malloc(KeysCollectionSize);
+if(!KeysCollection)
+{
+       /* Simple dialog ERROR */
+       simple_dialog(ESD_TYPE_ERROR,ESD_BTN_OK,"%s","Failed mamory allocation for KeysCollection!");
+       return;
+}
+
+/*
+ * Populate the key collection
+ */
+KeysCollection->nKeys = keys_in_list;
+
+for(i = 0; i < keys_in_list; i++)
+{
+    /* Retrieve the row infos */
+    gtk_clist_get_text(GTK_CLIST(key_ls),i,0,&row_type);  
+    gtk_clist_get_text(GTK_CLIST(key_ls),i,1,&row_key);
+    gtk_clist_get_text(GTK_CLIST(key_ls),i,2,&row_ssid); 
+    
+    if(g_strcasecmp(row_type,AIRPCAP_WEP_KEY_STRING) == 0)
+    KeysCollection->Keys[i].KeyType = AIRPCAP_KEYTYPE_WEP;
+    else if(g_strcasecmp(row_type,AIRPCAP_WPA_KEY_STRING) == 0)
+    KeysCollection->Keys[i].KeyType = AIRPCAP_KEYTYPE_TKIP;
+    else if(g_strcasecmp(row_type,AIRPCAP_WPA2_KEY_STRING) == 0)
+    KeysCollection->Keys[i].KeyType = AIRPCAP_KEYTYPE_CCMP;
+
+       /* Retrieve the Item corresponding to the i-th key */
+       new_key = g_string_new(row_key);
+       
+       KeysCollection->Keys[i].KeyLen = new_key->len / 2;
+       memset(&KeysCollection->Keys[i].KeyData, 0, sizeof(KeysCollection->Keys[i].KeyData));
+
+       for(j = 0 ; j < new_key->len; j += 2)
+       {
+               s[0] = new_key->str[j];
+               s[1] = new_key->str[j+1];
+               s[2] = '\0';
+               KeyByte = (UCHAR)strtol(s, NULL, 16);
+               KeysCollection->Keys[i].KeyData[j / 2] = KeyByte;
+       }
+}
+
+/*
+ * Free the old adapter key collection!
+ */
+if(fake_if_info->keysCollection != NULL)
+       g_free(fake_if_info->keysCollection);
+
+/*
+ * Set this collection ad the new one
+ */
+fake_if_info->keysCollection = KeysCollection;
+fake_if_info->keysCollectionSize = KeysCollectionSize;
+return;
+}
+
 /*
  * This function will take the current keys (widget list), specified for the
  * current adapter, and save them as default for ALL the others.
@@ -642,33 +772,57 @@ airpcap_read_and_save_decryption_keys_from_clist(GtkWidget* key_ls, airpcap_if_i
 {
 gint if_n = 0;
 gint i = 0;
+gint r = 0;
+gint n = 0;
 airpcap_if_info_t* curr_if = NULL;
+airpcap_if_info_t* fake_info_if = NULL;
+GList* key_list=NULL;
+char* tmp_key = NULL;
+
+/*
+ * Save the key list for driver.
+ */
+fake_info_if = airpcap_driver_fake_if_info_new();
+
+airpcap_add_keys_to_driver_from_list(key_ls,fake_info_if);
+airpcap_save_driver_if_configuration(fake_info_if);
+airpcap_if_info_free(fake_info_if);
 
 if( (if_list == NULL) || (info_if == NULL) ) return;
 
 if_n = g_list_length(if_list);
 
-/* For all the adapters in the list, save those keys as default */
+/* For all the adapters in the list, empty the key list */
 for(i = 0; i < if_n; i++)
       {
       curr_if = (airpcap_if_info_t*)g_list_nth_data(if_list,i);
       
       if(curr_if != NULL)
           {
-          /* If the interface is not the active one, we need to free it's
-             key list and copy in the selected key list... */
-          airpcap_add_keys_from_list(key_ls,curr_if);
+          /* XXX - Set an empty collection */
+                 airpcap_if_clear_decryption_settings(curr_if);
               
           /* Save to registry */
           airpcap_save_selected_if_configuration(curr_if);
           }
       }      
-      
+
 /* Save the settings of the given interface as default for Wireshark...
  * By the way, now all the adapters have the same keys, so it is not
  * really necessary to use THIS specific one...
  */
-save_wlan_wep_keys(info_if);                                          
+if( (r = save_wlan_driver_wep_keys()) == 0)
+       {
+       /* Create a list of keys from the list widget... */
+       n = GTK_CLIST(key_ls)->rows;
+       for(i = 0; i < n; i++)
+               {
+               gtk_clist_get_text(GTK_CLIST(key_ls),i,1,&tmp_key);
+               key_list = g_list_append(key_list,(gpointer)g_strdup(tmp_key));
+               }
+
+       r = save_wlan_wireshark_wep_keys(key_list);
+       }
 }
 
 /*
@@ -689,12 +843,16 @@ airpcap_check_decryption_keys(GList* if_list)
 gint if_n = 0;
 gint i = 0;
 gint n_adapters_keys = 0; 
+gint n_driver_keys = 0;
+gint n_wireshark_keys = 0;
 airpcap_if_info_t* curr_if = NULL;
 
 GList* wireshark_key_list;
+GList* driver_key_list;
 GList* curr_adapter_key_list;
 
 gboolean equals = TRUE;
+gboolean adapters_keys_equals=TRUE;
 
 /* 
  * If no AirPcap interface is found, return TRUE, so Wireshark
@@ -707,16 +865,26 @@ if_n = g_list_length(if_list);
 
 /* Get Wireshark preferences keys */
 wireshark_key_list = get_wireshark_keys();
+n_wireshark_keys = g_list_length(wireshark_key_list);
+
+/* Retrieve AirPcap driver's keys */
+driver_key_list = get_airpcap_driver_keys();
+n_driver_keys = g_list_length(driver_key_list);
+
+equals &= key_lists_are_equal(wireshark_key_list,driver_key_list);
 
 for(i = 0; i < if_n; i++)
       {
       curr_if = (airpcap_if_info_t*)g_list_nth_data(if_list,i);
       curr_adapter_key_list = get_airpcap_device_keys(curr_if);
       n_adapters_keys += g_list_length(curr_adapter_key_list);
-      equals &= key_lists_are_equal(wireshark_key_list,curr_adapter_key_list);
+      adapters_keys_equals &= key_lists_are_equal(wireshark_key_list,curr_adapter_key_list);
       }
 
-if(n_adapters_keys == 0) /* No keys set in any of the AirPcap adapters... */
+if(n_adapters_keys != 0) /* If for some reason at least one specific key has been found */
+       equals &= adapters_keys_equals; /* */
+
+if(n_driver_keys == 0) /* No keys set in any of the AirPcap adapters... */
     return TRUE; /* Use Wireshark keys and set them ad default for airpcap devices */
 
 return equals;
@@ -748,7 +916,7 @@ if_n = g_list_length(if_list);
 for(i = 0; i < if_n; i++)
       {
       curr_if = (airpcap_if_info_t*)g_list_nth_data(if_list,i);
-      load_wlan_wep_keys(curr_if);
+      load_wlan_driver_wep_keys();
       }
 }
 
@@ -763,23 +931,28 @@ gint if_n = 0;
 gint key_n = 0;
 gint i = 0;
 airpcap_if_info_t* curr_if = NULL;
+GList* empty_key_list = NULL;
 
 if( (key_list == NULL) || (adapters_list == NULL)) return;
 
 if_n = g_list_length(adapters_list);
 key_n = g_list_length(key_list);
 
+/* Set the driver's global list of keys. */
+write_wlan_driver_wep_keys_to_regitry(key_list);
+
+/* Empty the key list for each interface */
 for(i = 0; i < if_n; i++)
       {
       curr_if = (airpcap_if_info_t*)g_list_nth_data(adapters_list,i);
-      write_wlan_wep_keys_to_regitry(curr_if,key_list);
+      write_wlan_wep_keys_to_regitry(curr_if,empty_key_list);
       }
 
 /*
  * This will set the keys of the current adapter as Wireshark default...
  * Now all the adapters have the same keys, so curr_if is ok as any other...
  */
-save_wlan_wep_keys(curr_if);
+save_wlan_driver_wep_keys();
 }
 
 #endif /* HAVE_AIRPCAP */
index c953c31209b77b1a14e00fa8476d072d0c1381ad..ab01366ef483c0dcf67145bfe3d960573c9fe3b4 100755 (executable)
@@ -80,6 +80,12 @@ airpcap_set_toolbar_stop_capture(airpcap_if_info_t* if_info);
 void
 airpcap_add_key_to_list(GtkWidget *keylist, gchar* type, gchar* key, gchar* ssid);
 
+/*
+ * Takes the keys from the GtkList widget, and add them to the interface list
+ */
+void
+airpcap_add_keys_to_driver_from_list(GtkWidget *key_ls,airpcap_if_info_t *fake_if_info);
+
 /*
  * Modify a key given a list and a row
  */
@@ -90,7 +96,7 @@ airpcap_modify_key_in_list(GtkWidget *keylist, gint row, gchar* type, gchar* key
  * Fill the list with the keys
  */
 void
-airpcap_fill_key_list(GtkWidget *keylist,airpcap_if_info_t* if_info);
+airpcap_fill_key_list(GtkWidget *keylist);
 
 /*
  * Function used to retrieve the AirpcapValidationType given the string name.
index 98e48962384ebbc7541899f015d7adc552730fe6..496fe75c9459140bc3cdf236036dca406b7b6d92 100644 (file)
@@ -2084,6 +2084,7 @@ main(int argc, char *argv[])
   int                  status;
 
 #ifdef HAVE_AIRPCAP
+  int           airpcap_dll_ret_val;
   char                 err_str[AIRPCAP_ERRBUF_SIZE];
   gchar                        *cant_get_if_list_errstr;
 #endif
@@ -2129,7 +2130,8 @@ main(int argc, char *argv[])
 #ifdef HAVE_AIRPCAP
    /* Load the airpcap.dll.  This must also be done before collecting
     * run-time version information. */
-  if(load_airpcap())
+  airpcap_dll_ret_val = load_airpcap();
+  if(airpcap_dll_ret_val == AIRPCAP_DLL_OK)
        {
        /* load the airpcap interfaces */
        airpcap_if_list = get_airpcap_interface_list(&err, err_str);
@@ -2140,10 +2142,27 @@ main(int argc, char *argv[])
                   cant_get_if_list_errstr);
     g_free(cant_get_if_list_errstr);
        }
-
        /* select the first ad default (THIS SHOULD BE CHANGED) */
        airpcap_if_active = airpcap_get_default_if(airpcap_if_list);
        }
+  else if(airpcap_dll_ret_val == AIRPCAP_DLL_OLD)
+       {
+               simple_dialog(ESD_TYPE_ERROR, ESD_BTN_OK, "%s",
+                       "WARNING: The version of AirPcap on this system\n"
+                       "does not support driver-level decryption.  Please\n"
+                       "download a more recent version from\n" "http://www.cacetech.com/support/downloads.htm \n");
+       }
+       /*
+        * XXX - Maybe we need to warn the user if one of the following happens???
+        */
+/*  else if(airpcap_dll_ret_val == AIRPCAP_DLL_ERROR)
+    {
+               simple_dialog(ESD_TYPE_ERROR, ESD_BTN_OK, "%s","AIRPCAP_DLL_ERROR\n");
+    }
+  else if(airpcap_dll_ret_val == AIRPCAP_DLL_NOT_FOUND)
+       {
+               simple_dialog(ESD_TYPE_ERROR, ESD_BTN_OK, "%s","AIRPCAP_DDL_NOT_FOUND\n");
+       }*/
 #endif
 
   /* Start windows sockets */