From Dirk via bug #5771: Add heuristic dissector for images and HTTP
[obnox/wireshark/wip.git] / airpcap_loader.c
index 4dfdb614d9d0f3847d3314d7327fbcea98d4872c..a6ef77364d35a7744d64e4722570150bf31faee0 100644 (file)
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
  */
 
-#ifdef _WIN32
-
 #ifdef HAVE_CONFIG_H
 # include "config.h"
 #endif
 
+#ifdef HAVE_AIRPCAP
+
 #ifdef HAVE_LIBPCAP
 #include <glib.h>
 #include <gmodule.h>
 #include <epan/crypt/wep-wpadefs.h>
 #include <epan/crypt/airpdcap_ws.h>
 #include <epan/strutil.h>
+#include <epan/frequency-utils.h>
 #include "capture_ui_utils.h"
+#include <wsutil/file_util.h>
 
 #include "simple_dialog.h"
 
 #include <airpcap.h>
 #include "airpcap_loader.h"
 
-/*
- * We load dinamically the dag library in order link it only when
- * it's present on the system
- */
-static HMODULE AirpcapLib = NULL;
 
 /*
  * Set to TRUE if the DLL was successfully loaded AND all functions
@@ -64,13 +61,14 @@ static HMODULE AirpcapLib = NULL;
  */
 static gboolean AirpcapLoaded = FALSE;
 
+#ifdef _WIN32
+/*
+ * We load dynamically the dag library in order link it only when
+ * it's present on the system
+ */
+static void * AirpcapLib = NULL;
+
 static AirpcapGetLastErrorHandler g_PAirpcapGetLastError;
-static AirpcapGetDeviceListHandler g_PAirpcapGetDeviceList;
-static AirpcapFreeDeviceListHandler g_PAirpcapFreeDeviceList;
-static AirpcapOpenHandler g_PAirpcapOpen;
-static AirpcapCloseHandler g_PAirpcapClose;
-static AirpcapGetLinkTypeHandler g_PAirpcapGetLinkType;
-static AirpcapSetLinkTypeHandler g_PAirpcapSetLinkType;
 static AirpcapSetKernelBufferHandler g_PAirpcapSetKernelBuffer;
 static AirpcapSetFilterHandler g_PAirpcapSetFilter;
 static AirpcapGetMacAddressHandler g_PAirpcapGetMacAddress;
@@ -78,6 +76,16 @@ static AirpcapSetMinToCopyHandler g_PAirpcapSetMinToCopy;
 static AirpcapGetReadEventHandler g_PAirpcapGetReadEvent;
 static AirpcapReadHandler g_PAirpcapRead;
 static AirpcapGetStatsHandler g_PAirpcapGetStats;
+#endif
+
+static int AirpcapVersion = 3;
+
+static AirpcapGetDeviceListHandler g_PAirpcapGetDeviceList;
+static AirpcapFreeDeviceListHandler g_PAirpcapFreeDeviceList;
+static AirpcapOpenHandler g_PAirpcapOpen;
+static AirpcapCloseHandler g_PAirpcapClose;
+static AirpcapGetLinkTypeHandler g_PAirpcapGetLinkType;
+static AirpcapSetLinkTypeHandler g_PAirpcapSetLinkType;
 static AirpcapTurnLedOnHandler g_PAirpcapTurnLedOn;
 static AirpcapTurnLedOffHandler g_PAirpcapTurnLedOff;
 static AirpcapGetDeviceChannelHandler g_PAirpcapGetDeviceChannel;
@@ -96,6 +104,9 @@ static AirpcapGetDriverDecryptionStateHandler g_PAirpcapGetDriverDecryptionState
 static AirpcapSetDriverDecryptionStateHandler g_PAirpcapSetDriverDecryptionState;
 static AirpcapStoreCurConfigAsAdapterDefaultHandler g_PAirpcapStoreCurConfigAsAdapterDefault;
 static AirpcapGetVersionHandler g_PAirpcapGetVersion;
+static AirpcapSetDeviceChannelExHandler g_PAirpcapSetDeviceChannelEx;
+static AirpcapGetDeviceChannelExHandler g_PAirpcapGetDeviceChannelEx;
+static AirpcapGetDeviceSupportedChannelsHandler g_PAirpcapGetDeviceSupportedChannels;
 
 /* Airpcap interface list */
 GList *airpcap_if_list = NULL;
@@ -109,11 +120,34 @@ airpcap_if_info_t *airpcap_if_active = NULL;
 /* WLAN preferences pointer */
 module_t *wlan_prefs = NULL;
 
+Dot11Channel *pSupportedChannels;
+guint numSupportedChannels;
+
+static AirpcapChannelInfo LegacyChannels[] =
+{
+       {2412, 0, {0,0,0}},
+       {2417, 0, {0,0,0}},
+       {2422, 0, {0,0,0}},
+       {2427, 0, {0,0,0}},
+       {2432, 0, {0,0,0}},
+       {2437, 0, {0,0,0}},
+       {2442, 0, {0,0,0}},
+       {2447, 0, {0,0,0}},
+       {2452, 0, {0,0,0}},
+       {2457, 0, {0,0,0}},
+       {2462, 0, {0,0,0}},
+       {2467, 0, {0,0,0}},
+       {2472, 0, {0,0,0}},
+       {2484, 0, {0,0,0}},
+};
+
+static guint num_legacy_channels = 14;
+
 /*
  * Callback used by the load_wlan_keys() routine in order to read a WEP decryption key
  */
 static guint
-get_wep_key(pref_t *pref, gpointer ud _U_)
+get_wep_key(pref_t *pref, gpointer ud)
 {
     gchar *my_string = NULL;
     keys_cb_data_t* user_data;
@@ -123,21 +157,21 @@ get_wep_key(pref_t *pref, gpointer ud _U_)
     /* Retrieve user data info */
     user_data = (keys_cb_data_t*)ud;
 
-    if (g_strncasecmp(pref->name, "wep_key", 7) == 0 && pref->type == PREF_STRING)
-       {
+    if (g_ascii_strncasecmp(pref->name, "wep_key", 7) == 0 && pref->type == PREF_STRING)
+    {
        my_string = g_strdup(*pref->varp.string);
 
            /* Here we have the string describing the key... */
            new_key = parse_key_string(my_string);
 
        if( new_key != NULL)
-           {
+       {
            /* Key is added only if not null ... */
-               user_data->list = g_list_append(user_data->list,new_key);
-               user_data->number_of_keys++;
-               user_data->current_index++;
-               }
-           }
+           user_data->list = g_list_append(user_data->list,new_key);
+           user_data->number_of_keys++;
+           user_data->current_index++;
+       }
+    }
     return 0;
 }
 
@@ -149,28 +183,28 @@ wep_key_is_valid(char* key)
     guint i=0;
 
     if(key == NULL)
-           return FALSE;
+       return FALSE;
 
     new_key_string = g_string_new(key);
 
     if( ((new_key_string->len) > WEP_KEY_MAX_CHAR_SIZE) || ((new_key_string->len) < 2))
-           {
-           g_string_free(new_key_string,FALSE);
-           return FALSE;
-           }
+    {
+       g_string_free(new_key_string,FALSE);
+       return FALSE;
+    }
     if((new_key_string->len % 2) != 0)
-           {
+    {
+       g_string_free(new_key_string,FALSE);
+       return FALSE;
+    }
+    for(i = 0; i < new_key_string->len; i++)
+    {
+       if(!g_ascii_isxdigit(new_key_string->str[i]))
+       {
            g_string_free(new_key_string,FALSE);
            return FALSE;
-           }
-    for(i = 0; i < new_key_string->len; i++)
-           {
-           if(!g_ascii_isxdigit(new_key_string->str[i]))
-                   {
-                   g_string_free(new_key_string,FALSE);
-                   return FALSE;
-                   }
-           }
+       }
+    }
 
     g_string_free(new_key_string,FALSE);
     return TRUE;
@@ -189,40 +223,40 @@ set_wep_key(pref_t *pref, gpointer ud _U_)
     /* Retrieve user data info */
     user_data = (keys_cb_data_t*)ud;
 
-    if (g_strncasecmp(pref->name, "wep_key", 7) == 0 && pref->type == PREF_STRING)
-       {
+    if (g_ascii_strncasecmp(pref->name, "wep_key", 7) == 0 && pref->type == PREF_STRING)
+    {
        /* Ok, the pref we're gonna set is a wep_key ... but what number? */
        sscanf(pref->name,"wep_key%d",&wep_key_number);
 
        if(user_data->current_index < user_data->number_of_keys)
-           {
+       {
            if(wep_key_number == (user_data->current_index+1))
-               {
-                           /* Retrieve the nth decryption_key_t structure pointer */
-                           new_key = (decryption_key_t*)g_list_nth_data(user_data->list,user_data->current_index);
+           {
+               /* Retrieve the nth decryption_key_t structure pointer */
+               new_key = (decryption_key_t*)g_list_nth_data(user_data->list,user_data->current_index);
 
-                           /* Free the old key string */
-                           g_free((void *)*pref->varp.string);
+               /* Free the old key string */
+               g_free((void *)*pref->varp.string);
 
-                           /* Create the new string describing the decryption key */
-                           my_string = get_key_string(new_key);
+               /* Create the new string describing the decryption key */
+               my_string = get_key_string(new_key);
 
-                           /* Duplicate the string, and assign it to the variable pointer */
-                           *pref->varp.string = (void *)g_strdup(my_string);
+               /* Duplicate the string, and assign it to the variable pointer */
+               *pref->varp.string = (void *)g_strdup(my_string);
 
-                           /* Free the previously allocated string */
+               /* Free the previously allocated string */
                g_free(my_string);
-               }
            }
+       }
        else /* If the number of keys has been reduced somehow, we need to delete all the other keys
              * (remember that the new ones have been probably overwritten)
              */
-           {
+       {
            g_free((void *)*pref->varp.string);
            *pref->varp.string = (void *)g_strdup("");  /* Do not just free memory!!! Put an 'empty' string! */
-           }
-       user_data->current_index++;
        }
+       user_data->current_index++;
+    }
 
     return 0;
 }
@@ -231,12 +265,11 @@ set_wep_key(pref_t *pref, gpointer ud _U_)
  * Function used to read the Decryption Keys from the preferences and store them
  * properly into the airpcap adapter.
  */
-BOOL
-load_wlan_driver_wep_keys()
+gboolean
+load_wlan_driver_wep_keys(void)
 {
     keys_cb_data_t* user_data;
     guint i;
-    gchar *tmp = NULL;
 
     /* Retrieve the wlan preferences */
     wlan_prefs = prefs_find_module("wlan");
@@ -262,14 +295,14 @@ load_wlan_driver_wep_keys()
 
     prefs_apply(wlan_prefs);
 
-    write_wlan_driver_wep_keys_to_regitry(user_data->list);
+    write_wlan_driver_wep_keys_to_registry(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);
@@ -286,16 +319,16 @@ load_wlan_driver_wep_keys()
  * This function will tell the airpcap driver the key list to use
  * This will be stored into the registry...
  */
-BOOL
-write_wlan_wep_keys_to_regitry(airpcap_if_info_t* info_if, GList* key_list)
+gboolean
+write_wlan_wep_keys_to_registry(airpcap_if_info_t* info_if, GList* key_list)
 {
-    UINT i,j;
+    guint i,j;
     GString *new_key;
     gchar s[3];
     PAirpcapKeysCollection KeysCollection;
-    ULONG KeysCollectionSize;
-    UCHAR KeyByte;
-    UINT keys_in_list = 0;
+    guint KeysCollectionSize;
+    guint8 KeyByte;
+    guint keys_in_list = 0;
     decryption_key_t* key_item = NULL;
 
     keys_in_list = g_list_length(key_list);
@@ -316,7 +349,7 @@ write_wlan_wep_keys_to_regitry(airpcap_if_info_t* info_if, GList* key_list)
     KeysCollection = (PAirpcapKeysCollection)g_malloc(KeysCollectionSize);
     if(!KeysCollection)
     {
-           return FALSE;
+       return FALSE;
     }
 
     /*
@@ -328,30 +361,30 @@ write_wlan_wep_keys_to_regitry(airpcap_if_info_t* info_if, GList* key_list)
     {
        KeysCollection->Keys[i].KeyType = AIRPDCAP_KEY_TYPE_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);
+       /* 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));
+       KeysCollection->Keys[i].KeyLen = (guint) 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;
-           }
+       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 = (guint8)strtol(s, NULL, 16);
+           KeysCollection->Keys[i].KeyData[j / 2] = KeyByte;
+       }
 
-           g_string_free(new_key,TRUE);
+       g_string_free(new_key,TRUE);
 
     }
     /*
      * Free the old adapter key collection!
      */
     if(info_if->keysCollection != NULL)
-           g_free(info_if->keysCollection);
+       g_free(info_if->keysCollection);
 
     /*
      * Set this collection ad the new one
@@ -376,16 +409,16 @@ write_wlan_wep_keys_to_regitry(airpcap_if_info_t* info_if, GList* key_list)
  * 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)
+gboolean
+write_wlan_driver_wep_keys_to_registry(GList* key_list)
 {
-    UINT i,j,k,n,y;
+    guint i,j,k,n,y;
     GString *new_key;
     gchar s[3];
     PAirpcapKeysCollection KeysCollection;
-    ULONG KeysCollectionSize;
-    UCHAR KeyByte;
-    UINT keys_in_list = 0;
+    guint KeysCollectionSize;
+    guint8 KeyByte;
+    guint keys_in_list = 0;
     decryption_key_t* key_item = NULL;
     airpcap_if_info_t* fake_info_if = NULL;
 
@@ -393,7 +426,7 @@ write_wlan_driver_wep_keys_to_regitry(GList* key_list)
     fake_info_if = airpcap_driver_fake_if_info_new();
 
     if(fake_info_if == NULL)
-           return FALSE;
+       return FALSE;
 
     /*
      * XXX - When WPA will be supported, change this to: keys_in_list = g_list_length(key_list);
@@ -401,8 +434,8 @@ write_wlan_driver_wep_keys_to_regitry(GList* key_list)
      */
     n = g_list_length(key_list);
     for(k = 0; k < n; k++ )
-           if(((decryption_key_t*)g_list_nth_data(key_list,k))->type == AIRPDCAP_KEY_TYPE_WEP)
-                   keys_in_list++;
+       if(((decryption_key_t*)g_list_nth_data(key_list,k))->type == AIRPDCAP_KEY_TYPE_WEP)
+           keys_in_list++;
 
     /*
      * Save the encryption keys, if we have any of them
@@ -420,7 +453,7 @@ write_wlan_driver_wep_keys_to_regitry(GList* key_list)
     KeysCollection = (PAirpcapKeysCollection)g_malloc(KeysCollectionSize);
     if(!KeysCollection)
     {
-           return FALSE;
+       return FALSE;
     }
 
     /*
@@ -442,10 +475,10 @@ write_wlan_driver_wep_keys_to_regitry(GList* key_list)
        key_item = (decryption_key_t*)g_list_nth_data(key_list,i);
 
        /*
-        * XXX - The AIRPDCAP_KEY_TYPE_WEP is the only supportd right now!
+        * XXX - The AIRPDCAP_KEY_TYPE_WEP is the only supported right now!
         * We will have to modify the AirpcapKey structure in order to
         * support the other two types! What happens now, is that simply the
-        * not supported keys will just be discarded (they will be saved in wireshark though)
+        * not supported keys will just be discarded (they will be saved in Wireshark though)
         */
        if(key_item->type == AIRPDCAP_KEY_TYPE_WEP)
        {
@@ -453,7 +486,7 @@ write_wlan_driver_wep_keys_to_regitry(GList* key_list)
 
            new_key = g_string_new(key_item->key->str);
 
-           KeysCollection->Keys[y].KeyLen = new_key->len / 2;
+           KeysCollection->Keys[y].KeyLen = (guint) new_key->len / 2;
            memset(&KeysCollection->Keys[y].KeyData, 0, sizeof(KeysCollection->Keys[y].KeyData));
 
            for(j = 0 ; j < new_key->len; j += 2)
@@ -461,7 +494,7 @@ write_wlan_driver_wep_keys_to_regitry(GList* key_list)
                s[0] = new_key->str[j];
                s[1] = new_key->str[j+1];
                s[2] = '\0';
-               KeyByte = (UCHAR)strtol(s, NULL, 16);
+               KeyByte = (guint8)strtol(s, NULL, 16);
                KeysCollection->Keys[y].KeyData[j / 2] = KeyByte;
            }
            /* XXX - Change when WPA will be supported!!! */
@@ -470,11 +503,11 @@ write_wlan_driver_wep_keys_to_regitry(GList* key_list)
        }
        else if(key_item->type == AIRPDCAP_KEY_TYPE_WPA_PWD)
        {
-               /* XXX - The driver cannot deal with this kind of key yet... */
+           /* XXX - The driver cannot deal with this kind of key yet... */
        }
        else if(key_item->type == AIRPDCAP_KEY_TYPE_WPA_PMK)
        {
-               /* XXX - The driver cannot deal with this kind of key yet... */
+           /* XXX - The driver cannot deal with this kind of key yet... */
        }
     }
 
@@ -482,7 +515,7 @@ write_wlan_driver_wep_keys_to_regitry(GList* key_list)
      * Free the old adapter key collection!
      */
     if(fake_info_if->keysCollection != NULL)
-           g_free(fake_info_if->keysCollection);
+       g_free(fake_info_if->keysCollection);
 
     /*
      * Set this collection ad the new one
@@ -509,7 +542,7 @@ write_wlan_driver_wep_keys_to_regitry(GList* key_list)
  *  Function used to save to the preference file the Decryption Keys.
  */
 int
-save_wlan_driver_wep_keys()
+save_wlan_driver_wep_keys(void)
 {
     GList* key_list = NULL;
     char* tmp_key = NULL;
@@ -521,7 +554,7 @@ save_wlan_driver_wep_keys()
     fake_info_if = airpcap_driver_fake_if_info_new();
 
     if(fake_info_if == NULL)
-           return FALSE;
+       return 0;
 
     /* Retrieve the wlan preferences */
     wlan_prefs = prefs_find_module("wlan");
@@ -529,7 +562,6 @@ save_wlan_driver_wep_keys()
     /* 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);
@@ -539,11 +571,11 @@ save_wlan_driver_wep_keys()
     for(i=0; i<keys_in_list; i++)
     {
     /* Only if it is a WEP key... */
-    if(fake_info_if->keysCollection->Keys[i].KeyType == AIRPDCAP_KEY_TYPE_WEP)
+       if(fake_info_if->keysCollection->Keys[i].KeyType == AIRPDCAP_KEY_TYPE_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);
+           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);
        }
     }
 
@@ -571,9 +603,9 @@ save_wlan_driver_wep_keys()
     /* 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);
@@ -593,10 +625,8 @@ 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;
     decryption_key_t* tmp_dk;
 
     /* Retrieve the wlan preferences */
@@ -630,11 +660,11 @@ save_wlan_wireshark_wep_keys(GList* key_ls)
     /* FREE MEMORY */
     /* free the WEP key string */
     for(i=0;i<g_list_length(user_data->list);i++)
-       {
-           tmp_dk = (decryption_key_t*)g_list_nth(user_data->list,i)->data;
-           g_string_free(tmp_dk->key,TRUE);
-           if(tmp_dk->ssid != NULL) g_byte_array_free(tmp_dk->ssid,TRUE);
-       }
+    {
+       tmp_dk = (decryption_key_t*)g_list_nth(user_data->list,i)->data;
+       g_string_free(tmp_dk->key,TRUE);
+       if(tmp_dk->ssid != NULL) g_byte_array_free(tmp_dk->ssid,TRUE);
+    }
 
     /* free the (empty) list */
     g_list_free(user_data->list);
@@ -649,221 +679,414 @@ save_wlan_wireshark_wep_keys(GList* key_ls)
  * Get an error message string for a CANT_GET_INTERFACE_LIST error from
  * "get_airpcap_interface_list()".
  */
-gchar *
+static gchar *
 cant_get_airpcap_if_list_error_message(const char *err_str)
 {
-       return g_strdup_printf("Can't get list of Wireless interfaces: %s", err_str);
+    return g_strdup_printf("Can't get list of Wireless interfaces: %s", err_str);
 }
 
 /*
  * Airpcap wrapper, used to store the current settings for the selected adapter
  */
-BOOL
+gboolean
 airpcap_if_store_cur_config_as_adapter_default(PAirpcapHandle ah)
 {
-       if (!AirpcapLoaded) return FALSE;
-       return g_PAirpcapStoreCurConfigAsAdapterDefault(ah);
+    if (!AirpcapLoaded) return FALSE;
+    return g_PAirpcapStoreCurConfigAsAdapterDefault(ah);
 }
 
 /*
  * Airpcap wrapper, used to open an airpcap adapter
  */
 PAirpcapHandle
-airpcap_if_open(PCHAR name, PCHAR err)
+airpcap_if_open(gchar * name, gchar * err)
 {
-       if (!AirpcapLoaded) return NULL;
-       if (name == NULL) return NULL;
-       return g_PAirpcapOpen(name,err);
+    if (!AirpcapLoaded) return NULL;
+    if (name == NULL) return NULL;
+    return g_PAirpcapOpen(name,err);
 }
 
 /*
  * Airpcap wrapper, used to close an airpcap adapter
  */
-VOID
+void
 airpcap_if_close(PAirpcapHandle handle)
 {
-       if (!AirpcapLoaded) return;
-       g_PAirpcapClose(handle);
+    if (!AirpcapLoaded) return;
+    g_PAirpcapClose(handle);
+}
+
+/*
+ * Retrieve the state of the Airpcap DLL
+ */
+int
+airpcap_get_dll_state(void)
+{
+  return AirpcapVersion;
 }
 
 /*
  * Airpcap wrapper, used to turn on the led of an airpcap adapter
  */
-BOOL
-airpcap_if_turn_led_on(PAirpcapHandle AdapterHandle, UINT LedNumber)
+gboolean
+airpcap_if_turn_led_on(PAirpcapHandle AdapterHandle, guint LedNumber)
 {
-       if (!AirpcapLoaded) return FALSE;
-       return g_PAirpcapTurnLedOn(AdapterHandle,LedNumber);
+    if (!AirpcapLoaded) return FALSE;
+    return g_PAirpcapTurnLedOn(AdapterHandle,LedNumber);
 }
 
 /*
  * Airpcap wrapper, used to turn off the led of an airpcap adapter
  */
-BOOL
-airpcap_if_turn_led_off(PAirpcapHandle AdapterHandle, UINT LedNumber)
+gboolean
+airpcap_if_turn_led_off(PAirpcapHandle AdapterHandle, guint LedNumber)
 {
-       if (!AirpcapLoaded) return FALSE;
-       return g_PAirpcapTurnLedOff(AdapterHandle,LedNumber);
+    if (!AirpcapLoaded) return FALSE;
+    return g_PAirpcapTurnLedOff(AdapterHandle,LedNumber);
 }
 
 /*
  * Airpcap wrapper, used to get the channel of an airpcap adapter
  */
-BOOL
-airpcap_if_get_device_channel(PAirpcapHandle ah, PUINT ch)
+gboolean
+airpcap_if_get_device_channel(PAirpcapHandle ah, guint * ch)
 {
-       if (!AirpcapLoaded) return FALSE;
-       return g_PAirpcapGetDeviceChannel(ah,ch);
+    if (!AirpcapLoaded) return FALSE;
+    return g_PAirpcapGetDeviceChannel(ah,ch);
+}
+
+/*
+ * Airpcap wrapper, used to get the supported channels of an airpcap adapter
+ */
+gboolean
+airpcap_if_get_device_supported_channels(PAirpcapHandle ah, AirpcapChannelInfo **cInfo, guint * nInfo)
+{
+    if (!AirpcapLoaded) return FALSE;
+    if (airpcap_get_dll_state() == AIRPCAP_DLL_OLD){
+      *nInfo = num_legacy_channels;
+      *cInfo = (AirpcapChannelInfo*)&LegacyChannels;
+
+      return TRUE;
+    } else if (airpcap_get_dll_state() == AIRPCAP_DLL_OK){
+      return g_PAirpcapGetDeviceSupportedChannels(ah, cInfo, nInfo);
+    }
+    return FALSE;
+}
+
+/*
+ * Airpcap wrapper, used to get the supported channels of an airpcap adapter
+ */
+Dot11Channel*
+airpcap_if_get_device_supported_channels_array(PAirpcapHandle ah, guint * pNumSupportedChannels)
+{
+    AirpcapChannelInfo *chanInfo;
+    guint i=0, j=0, numInfo = 0;
+
+    if (!AirpcapLoaded)
+        return NULL;
+    if (airpcap_if_get_device_supported_channels(ah, &chanInfo, &numInfo) == FALSE)
+        return NULL;
+    numSupportedChannels = 0;
+
+    /*
+     * allocate a bigger array
+     */
+    if (numInfo == 0)
+        return NULL;
+
+    pSupportedChannels = g_malloc(numInfo * (sizeof *pSupportedChannels));
+
+    for (i = 0; i < numInfo; i++)
+    {
+        guint supportedChannel = G_MAXUINT;
+
+        /*
+         * search if we have it already
+         */
+        for (j = 0; j < numSupportedChannels; j++)
+        {
+            if (pSupportedChannels[j].Frequency == chanInfo[i].Frequency)
+            {
+                supportedChannel = j;
+                break;
+            }
+        }
+
+        if (supportedChannel == G_MAXUINT)
+        {
+            /*
+             * not found, create a new item
+             */
+            pSupportedChannels[numSupportedChannels].Frequency = chanInfo[i].Frequency;
+
+            switch(chanInfo[i].ExtChannel)
+            {
+                case -1:
+                    pSupportedChannels[numSupportedChannels].Flags = FLAG_CAN_BE_LOW;
+                    break;
+                case +1:
+                    pSupportedChannels[numSupportedChannels].Flags = FLAG_CAN_BE_HIGH;
+                    break;
+                case 0:
+                default:
+                    pSupportedChannels[numSupportedChannels].Flags = 0;
+            }
+
+            /*
+             * Gather channel information
+             */
+
+            pSupportedChannels[numSupportedChannels].Flags |=
+                FREQ_IS_BG(pSupportedChannels[numSupportedChannels].Frequency) ?
+                    FLAG_IS_BG_CHANNEL : FLAG_IS_A_CHANNEL;
+            pSupportedChannels[numSupportedChannels].Channel =
+                ieee80211_mhz_to_chan(pSupportedChannels[numSupportedChannels].Frequency);
+            numSupportedChannels++;
+        }
+        else
+        {
+            /*
+             * just update the ext channel flags
+             */
+            switch(chanInfo[i].ExtChannel)
+            {
+                case -1:
+                    pSupportedChannels[supportedChannel].Flags |= FLAG_CAN_BE_LOW;
+                    break;
+                case +1:
+                    pSupportedChannels[supportedChannel].Flags |= FLAG_CAN_BE_HIGH;
+                    break;
+                case 0:
+                default:
+                    break;
+            }
+        }
+    }
+
+    if (numSupportedChannels < 1)
+        return NULL;
+    /*
+     * Now sort the list by frequency
+     */
+    for (i = 0 ; i < numSupportedChannels - 1; i++)
+    {
+        for (j = i + 1; j < numSupportedChannels; j++)
+        {
+            if (pSupportedChannels[i].Frequency > pSupportedChannels[j].Frequency)
+            {
+                Dot11Channel temp = pSupportedChannels[i];
+                pSupportedChannels[i] = pSupportedChannels[j];
+                pSupportedChannels[j] = temp;
+            }
+        }
+    }
+
+    *pNumSupportedChannels = numSupportedChannels;
+    return pSupportedChannels;
 }
 
 /*
  * Airpcap wrapper, used to set the channel of an airpcap adapter
  */
-BOOL
-airpcap_if_set_device_channel(PAirpcapHandle ah, UINT ch)
+gboolean
+airpcap_if_set_device_channel(PAirpcapHandle ah, guint ch)
 {
-       if (!AirpcapLoaded) return FALSE;
-       return g_PAirpcapSetDeviceChannel(ah,ch);
+    if (!AirpcapLoaded) return FALSE;
+    return g_PAirpcapSetDeviceChannel(ah,ch);
+}
+
+/*
+ * Airpcap wrapper, used to set the frequency of an airpcap adapter
+ */
+gboolean
+airpcap_if_set_device_channel_ex(PAirpcapHandle ah, AirpcapChannelInfo ChannelInfo)
+{
+    if (!AirpcapLoaded) return FALSE;
+    if (airpcap_get_dll_state() == AIRPCAP_DLL_OLD){
+      gint channel = 0;
+      channel = ieee80211_mhz_to_chan(ChannelInfo.Frequency);
+
+      if (channel < 0){
+        return FALSE;
+      } else {
+        return airpcap_if_set_device_channel(ah, channel);
+      }
+    } else if (airpcap_get_dll_state() == AIRPCAP_DLL_OK){
+      return g_PAirpcapSetDeviceChannelEx (ah, ChannelInfo);
+    }
+
+    return FALSE;
+}
+
+/*
+ * Airpcap wrapper, used to get the frequency of an airpcap adapter
+ */
+gboolean
+airpcap_if_get_device_channel_ex(PAirpcapHandle ah, PAirpcapChannelInfo pChannelInfo)
+{
+    if (!AirpcapLoaded) return FALSE;
+
+    pChannelInfo->Frequency = 0;
+    pChannelInfo->ExtChannel = 0;
+    pChannelInfo->Reserved[0] = 0;
+    pChannelInfo->Reserved[1] = 0;
+    pChannelInfo->Reserved[2] = 0;
+
+    if (airpcap_get_dll_state() == AIRPCAP_DLL_OLD){
+      guint channel = 0;
+      guint chan_freq = 0;
+
+      if (!airpcap_if_get_device_channel(ah, &channel)) return FALSE;
+
+      chan_freq = ieee80211_chan_to_mhz(channel, TRUE);
+      if (chan_freq == 0) return FALSE;
+      pChannelInfo->Frequency = chan_freq;
+
+      return TRUE;
+    } else if (airpcap_get_dll_state() == AIRPCAP_DLL_OK){
+      return g_PAirpcapGetDeviceChannelEx (ah, pChannelInfo);
+    }
+    return FALSE;
 }
 
 /*
  * Airpcap wrapper, used to get the link type of an airpcap adapter
  */
-BOOL
+gboolean
 airpcap_if_get_link_type(PAirpcapHandle ah, PAirpcapLinkType lt)
 {
-       if (!AirpcapLoaded) return FALSE;
-       return g_PAirpcapGetLinkType(ah,lt);
+    if (!AirpcapLoaded) return FALSE;
+    return g_PAirpcapGetLinkType(ah,lt);
 }
 
 /*
  * Airpcap wrapper, used to set the link type of an airpcap adapter
  */
-BOOL
+gboolean
 airpcap_if_set_link_type(PAirpcapHandle ah, AirpcapLinkType lt)
 {
-       if (!AirpcapLoaded) return FALSE;
-       return g_PAirpcapSetLinkType(ah,lt);
+    if (!AirpcapLoaded) return FALSE;
+    return g_PAirpcapSetLinkType(ah,lt);
 }
 
 /*
  * Airpcap wrapper, used to get the fcs presence of an airpcap adapter
  */
-BOOL
-airpcap_if_get_fcs_presence(PAirpcapHandle ah, PBOOL fcs)
+gboolean
+airpcap_if_get_fcs_presence(PAirpcapHandle ah, gboolean * fcs)
 {
-       if (!AirpcapLoaded) return FALSE;
-       return g_PAirpcapGetFcsPresence(ah,fcs);
+    if (!AirpcapLoaded) return FALSE;
+    return g_PAirpcapGetFcsPresence(ah,fcs);
 }
 
 /*
  * Airpcap wrapper, used to set the fcs presence of an airpcap adapter
  */
-BOOL
-airpcap_if_set_fcs_presence(PAirpcapHandle ah, BOOL fcs)
+gboolean
+airpcap_if_set_fcs_presence(PAirpcapHandle ah, gboolean fcs)
 {
-       if (!AirpcapLoaded) return FALSE;
-       return g_PAirpcapSetFcsPresence(ah,fcs);
+    if (!AirpcapLoaded) return FALSE;
+    return g_PAirpcapSetFcsPresence(ah,fcs);
 }
 
 /*
  * Airpcap wrapper, used to get the decryption enabling of an airpcap adapter
  */
-BOOL
+gboolean
 airpcap_if_get_decryption_state(PAirpcapHandle ah, PAirpcapDecryptionState PEnable)
 {
-       if (!AirpcapLoaded) return FALSE;
-       return g_PAirpcapGetDecryptionState(ah,PEnable);
+    if (!AirpcapLoaded) return FALSE;
+    return g_PAirpcapGetDecryptionState(ah,PEnable);
 }
 
 /*
  * Airpcap wrapper, used to set the decryption enabling of an airpcap adapter
  */
-BOOL
+gboolean
 airpcap_if_set_decryption_state(PAirpcapHandle ah, AirpcapDecryptionState Enable)
 {
-       if (!AirpcapLoaded) return FALSE;
-       return g_PAirpcapSetDecryptionState(ah,Enable);
+    if (!AirpcapLoaded) return FALSE;
+    return g_PAirpcapSetDecryptionState(ah,Enable);
 }
 
 /*
  * Airpcap wrapper, used to get the decryption enabling of an airpcap driver
  */
-BOOL
+gboolean
 airpcap_if_get_driver_decryption_state(PAirpcapHandle ah, PAirpcapDecryptionState PEnable)
 {
-       if (!AirpcapLoaded || (g_PAirpcapGetDriverDecryptionState==NULL)) return FALSE;
-       return g_PAirpcapGetDriverDecryptionState(ah,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
+gboolean
 airpcap_if_set_driver_decryption_state(PAirpcapHandle ah, AirpcapDecryptionState Enable)
 {
-       if (!AirpcapLoaded || (g_PAirpcapSetDriverDecryptionState==NULL)) return FALSE;
-       return g_PAirpcapSetDriverDecryptionState(ah,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
  */
-BOOL
+gboolean
 airpcap_if_get_fcs_validation(PAirpcapHandle ah, PAirpcapValidationType val)
 {
-       if (!AirpcapLoaded) return FALSE;
-       return g_PAirpcapGetFcsValidation(ah,val);
+    if (!AirpcapLoaded) return FALSE;
+    return g_PAirpcapGetFcsValidation(ah,val);
 }
 
 /*
  * Airpcap wrapper, used to set the fcs validation of an airpcap adapter
  */
-BOOL
+gboolean
 airpcap_if_set_fcs_validation(PAirpcapHandle ah, AirpcapValidationType val)
 {
-       if (!AirpcapLoaded) return FALSE;
-       return g_PAirpcapSetFcsValidation(ah,val);
+    if (!AirpcapLoaded) return FALSE;
+    return g_PAirpcapSetFcsValidation(ah,val);
 }
 
 /*
  * Airpcap wrapper, used to save the settings for the selected_if
  */
-BOOL
+gboolean
 airpcap_if_set_device_keys(PAirpcapHandle AdapterHandle, PAirpcapKeysCollection KeysCollection)
 {
-       if (!AirpcapLoaded) return FALSE;
-       return g_PAirpcapSetDeviceKeys(AdapterHandle,KeysCollection);
+    if (!AirpcapLoaded) return FALSE;
+    return g_PAirpcapSetDeviceKeys(AdapterHandle,KeysCollection);
 }
 
 /*
  * Airpcap wrapper, used to save the settings for the selected_if
  */
-BOOL
-airpcap_if_get_device_keys(PAirpcapHandle AdapterHandle, PAirpcapKeysCollection KeysCollection, PUINT PKeysCollectionSize)
+gboolean
+airpcap_if_get_device_keys(PAirpcapHandle AdapterHandle, PAirpcapKeysCollection KeysCollection, guint * PKeysCollectionSize)
 {
-       if (!AirpcapLoaded) return FALSE;
-       return g_PAirpcapGetDeviceKeys(AdapterHandle,KeysCollection,PKeysCollectionSize);
+    if (!AirpcapLoaded) return FALSE;
+    return g_PAirpcapGetDeviceKeys(AdapterHandle,KeysCollection,PKeysCollectionSize);
 }
 
 /*
  * Airpcap wrapper, used to save the driver's set of keys
  */
-BOOL
+gboolean
 airpcap_if_set_driver_keys(PAirpcapHandle AdapterHandle, PAirpcapKeysCollection KeysCollection)
 {
-       if (!AirpcapLoaded || (g_PAirpcapSetDriverKeys==NULL)) return FALSE;
-       return g_PAirpcapSetDriverKeys(AdapterHandle,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)
+gboolean
+airpcap_if_get_driver_keys(PAirpcapHandle AdapterHandle, PAirpcapKeysCollection KeysCollection, guint * PKeysCollectionSize)
 {
-       if (!AirpcapLoaded || (g_PAirpcapGetDriverKeys==NULL)) return FALSE;
-       return g_PAirpcapGetDriverKeys(AdapterHandle,KeysCollection,PKeysCollectionSize);
+    if (!AirpcapLoaded || (g_PAirpcapGetDriverKeys==NULL)) return FALSE;
+    return g_PAirpcapGetDriverKeys(AdapterHandle,KeysCollection,PKeysCollectionSize);
 }
 
 /*
@@ -872,78 +1095,83 @@ airpcap_if_get_driver_keys(PAirpcapHandle AdapterHandle, PAirpcapKeysCollection
 airpcap_if_info_t *
 airpcap_if_info_new(char *name, char *description)
 {
-PAirpcapHandle ad;
-gchar ebuf[AIRPCAP_ERRBUF_SIZE];
-
-       airpcap_if_info_t *if_info = NULL;
+    PAirpcapHandle ad;
+    gchar ebuf[AIRPCAP_ERRBUF_SIZE];
 
-       /* Probably I have to switch on the leds!!! */
-       ad = airpcap_if_open(name, ebuf);
-       if(ad)
-               {
-       if_info = g_malloc(sizeof (airpcap_if_info_t));
-       if_info->name = g_strdup(name);
-       if (description == NULL)
-               if_info->description = NULL;
-       else
-               if_info->description = g_strdup(description);
-       if_info->ip_addr = NULL;
-       if_info->loopback = FALSE;
-               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_device_channel(ad,&(if_info->channel));
-               airpcap_if_turn_led_on(ad, 0);
-               airpcap_if_get_decryption_state(ad, &(if_info->DecryptionOn));
-               if_info->led = TRUE;
-               if_info->blinking = FALSE;
-               if_info->saved = TRUE; /* NO NEED TO BE SAVED */
+    airpcap_if_info_t *if_info = NULL;
 
-               /* get the keys, if everything is ok, close the adapter */
-               if(airpcap_if_load_keys(ad,if_info))
-                       airpcap_if_close(ad);
-               }
-       return if_info;
+    /* Probably I have to switch on the leds!!! */
+    ad = airpcap_if_open(name, ebuf);
+    if(ad)
+    {
+               if_info = g_malloc0(sizeof (airpcap_if_info_t));
+               if_info->name = g_strdup(name);
+               if (description == NULL){
+                       if_info->description = NULL;
+               }else{
+                       if_info->description = g_strdup(description);
+               }
+
+               if_info->ip_addr = NULL;
+               if_info->loopback = FALSE;
+               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_device_channel_ex(ad,&(if_info->channelInfo));
+               if_info->pSupportedChannels = airpcap_if_get_device_supported_channels_array(ad, &(if_info->numSupportedChannels));
+               airpcap_if_turn_led_on(ad, 0);
+               airpcap_if_get_decryption_state(ad, &(if_info->DecryptionOn));
+               if_info->led = TRUE;
+               if_info->blinking = FALSE;
+               if_info->saved = TRUE; /* NO NEED TO BE SAVED */
+
+               /* get the keys, if everything is ok, close the adapter */
+               if(airpcap_if_load_keys(ad,if_info))
+               {
+                       airpcap_if_close(ad);
+               }
+    }
+    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()
+airpcap_driver_fake_if_info_new(void)
 {
-       PAirpcapHandle ad;
-       gchar ebuf[AIRPCAP_ERRBUF_SIZE];
+    PAirpcapHandle ad;
+    gchar ebuf[AIRPCAP_ERRBUF_SIZE];
 
-       airpcap_if_info_t *if_info = NULL;
-       airpcap_if_info_t *fake_if_info = NULL;
+    airpcap_if_info_t *if_info = NULL;
+    airpcap_if_info_t *fake_if_info = NULL;
 
-       /* Maybe for some reason no airpcap adapter is found */
-       if(airpcap_if_list == NULL)
-               return NULL;
+    /* Maybe for some reason no airpcap adapter is found */
+    if(airpcap_if_list == NULL)
+       return 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;
+    /*
+     * 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;
 
-       /* Open the 'fake' adapter */
-       ad = airpcap_if_open(if_info->name, ebuf);
-       if(ad)
-               {
-       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)
+    {
+               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;
                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_get_device_channel_ex(ad,&(fake_if_info->channelInfo));
                airpcap_if_turn_led_on(ad, 0);
                fake_if_info->led = TRUE;
                fake_if_info->blinking = FALSE;
@@ -951,10 +1179,12 @@ airpcap_driver_fake_if_info_new()
 
                /* 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;
+    return fake_if_info;
 }
 
 /*
@@ -963,34 +1193,45 @@ airpcap_driver_fake_if_info_new()
 void
 airpcap_if_info_print(airpcap_if_info_t* if_info)
 {
+    guint i;
     if(if_info == NULL)
-           {
-           g_print("\nWARNING : AirPcap Interface pointer is NULL!\n");
-           return;
-           }
+    {
+               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("                      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("     channelInfo.Frequency: %u\n",if_info->channelInfo.Frequency);
+    g_print("    channelInfo.ExtChannel: %d\n",if_info->channelInfo.ExtChannel);
+    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("SUPPORTED CHANNELS POINTER: %p\n",if_info->pSupportedChannels);
+    g_print("    NUM SUPPORTED CHANNELS: %u\n",if_info->numSupportedChannels);
+
+    for(i=0; i<(if_info->numSupportedChannels); i++){
+      g_print("\n        SUPPORTED CHANNEL #%u\n",i+1);
+      g_print("                   CHANNEL: %u\n",if_info->pSupportedChannels[i].Channel);
+      g_print("                 FREQUENCY: %u\n",if_info->pSupportedChannels[i].Frequency);
+      g_print("                     FLAGS: %u\n",if_info->pSupportedChannels[i].Flags);
+    }
     g_print("\n\n");
 }
 
 /*
  * Function used to load the WEP keys for a selected interface
  */
-BOOL
+gboolean
 airpcap_if_load_keys(PAirpcapHandle ad, airpcap_if_info_t *if_info)
 {
     if(!if_info) return FALSE;
@@ -999,26 +1240,26 @@ airpcap_if_load_keys(PAirpcapHandle ad, airpcap_if_info_t *if_info)
     if_info->keysCollection = NULL;
 
     if(!airpcap_if_get_device_keys(ad, NULL, &(if_info->keysCollectionSize)))
-           {
-           if(if_info->keysCollectionSize == 0)
-                   {
-                   if_info->keysCollection = NULL;
-                   airpcap_if_close(ad);
-                   return FALSE;
-                   }
+    {
+       if(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;
-                   }
+       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;
@@ -1027,33 +1268,33 @@ airpcap_if_load_keys(PAirpcapHandle ad, airpcap_if_info_t *if_info)
 /*
  * Function used to load the WEP keys for a selected interface
  */
-BOOL
+gboolean
 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;
-                   }
+    {
+       if(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;
-                   }
+       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_get_driver_keys(ad, if_info->keysCollection, &(if_info->keysCollectionSize));
+       return TRUE;
+    }
 
     airpcap_if_close(ad);
     return FALSE;
@@ -1065,10 +1306,10 @@ airpcap_if_load_driver_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);
+    if(if_info->keysCollection != NULL)
+       g_PAirpcapSetDeviceKeys(ad,if_info->keysCollection);
 }
 
 /*
@@ -1077,8 +1318,8 @@ airpcap_if_save_keys(PAirpcapHandle ad, airpcap_if_info_t *if_info)
 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);
+    if(if_info->keysCollection != NULL)
+       airpcap_if_set_driver_keys(ad,if_info->keysCollection);
 }
 
 /*
@@ -1087,26 +1328,26 @@ airpcap_if_save_driver_keys(PAirpcapHandle ad, airpcap_if_info_t *if_info)
 static void
 free_airpcap_if_cb(gpointer data, gpointer user_data _U_)
 {
-       airpcap_if_info_t *if_info = data;
+    airpcap_if_info_t *if_info = data;
 
-       if (if_info->name != NULL)
-               g_free(if_info->name);
+    if (if_info->name != NULL)
+       g_free(if_info->name);
 
-       if (if_info->description != NULL)
-               g_free(if_info->description);
+    if (if_info->description != NULL)
+       g_free(if_info->description);
 
-       /* XXX - FREE THE WEP KEY LIST HERE!!!*/
-       if(if_info->keysCollection != NULL)
-               {
-               g_free(if_info->keysCollection);
-               if_info->keysCollection = NULL;
-               }
+    /* 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);
+    if(if_info->ip_addr != NULL)
+       g_slist_free(if_info->ip_addr);
 
-       if(if_info != NULL)
-               g_free(if_info);
+    if(if_info != NULL)
+       g_free(if_info);
 }
 
 /*
@@ -1115,9 +1356,9 @@ free_airpcap_if_cb(gpointer data, gpointer user_data _U_)
 void
 free_airpcap_interface_list(GList *if_list)
 {
-       g_list_foreach(if_list, free_airpcap_if_cb, NULL);
-       g_list_free(if_list);
-       if_list = NULL;
+    g_list_foreach(if_list, free_airpcap_if_cb, NULL);
+    g_list_free(if_list);
+    if_list = NULL;
 }
 
 /*
@@ -1125,20 +1366,29 @@ free_airpcap_interface_list(GList *if_list)
  * Will return null if no device is found.
  */
 GList*
-get_airpcap_interface_list(int *err, char *err_str)
+get_airpcap_interface_list(int *err, char **err_str)
 {
     GList  *il = NULL;
     airpcap_if_info_t *if_info;
-    int i, n_adapts;
+    int n_adapts;
     AirpcapDeviceDescription *devsList, *adListEntry;
+    char errbuf[PCAP_ERRBUF_SIZE];
+
+    *err = 0;
 
-    if (err)
-           *err = NO_AIRPCAP_INTERFACES_FOUND;
+    if (!AirpcapLoaded)
+    {
+               *err = AIRPCAP_NOT_LOADED;
+               return il;
+    }
 
-    if(!AirpcapLoaded || !g_PAirpcapGetDeviceList(&devsList, err_str))
+    if (!g_PAirpcapGetDeviceList(&devsList, errbuf))
     {
-           /* No interfaces, return il = NULL; */
-           return il;
+               /* No interfaces, return il = NULL; */
+               *err = CANT_GET_AIRPCAP_INTERFACE_LIST;
+               if (err_str != NULL)
+                       *err_str = cant_get_airpcap_if_list_error_message(errbuf);
+               return il;
     }
 
     /*
@@ -1148,27 +1398,32 @@ get_airpcap_interface_list(int *err, char *err_str)
     n_adapts = 0;
     while(adListEntry)
     {
-           n_adapts++;
-           adListEntry = adListEntry->next;
+       n_adapts++;
+       adListEntry = adListEntry->next;
     }
 
     if(n_adapts == 0)
     {
-           /* No interfaces, return il= NULL */
-           g_PAirpcapFreeDeviceList(devsList);
-           return il;
+               /* No interfaces, return il= NULL */
+               g_PAirpcapFreeDeviceList(devsList);
+               *err = NO_AIRPCAP_INTERFACES_FOUND;
+               if (err_str != NULL)
+                       *err_str = NULL;
+               return il;
     }
 
     /*
      * Insert the adapters in our list
      */
     adListEntry = devsList;
-    for(i = 0; i < n_adapts; i++)
+    while(adListEntry)
     {
-           if_info = airpcap_if_info_new(adListEntry->Name, adListEntry->Description);
-    il = g_list_append(il, if_info);
+               if_info = airpcap_if_info_new(adListEntry->Name, adListEntry->Description);
+               if (if_info != NULL){
+                       il = g_list_append(il, if_info);
+               }
 
-           adListEntry = adListEntry->next;
+               adListEntry = adListEntry->next;
     }
 
     g_PAirpcapFreeDeviceList(devsList);
@@ -1177,10 +1432,10 @@ get_airpcap_interface_list(int *err, char *err_str)
 }
 
 /*
- * Used to retrieve the name of the interface given the description
- * (the name is used in AirpcapOpen, the description is put in the combo box)
+ * Used to retrieve the interface given the name
+ * (the name is used in AirpcapOpen)
  */
-gchar* get_airpcap_name_from_description(GList* if_list, gchar* description)
+airpcap_if_info_t* get_airpcap_if_from_name(GList* if_list, const gchar* name)
 {
     unsigned int ifn;
     GList* curr;
@@ -1197,47 +1452,22 @@ gchar* get_airpcap_name_from_description(GList* if_list, gchar* description)
            if(curr != NULL)
                    if_info = curr->data;
            if(if_info != NULL)
-                   if ( g_ascii_strcasecmp(if_info->description,description) == 0)
-                   {
-                       return if_info->name;
-                   }
+           {
+               if ( g_ascii_strcasecmp(if_info->name,name) == 0
+#ifdef HAVE_PCAP_REMOTE /* The interface will be prepended with "rpcap://" */
+                       || g_str_has_suffix(name, if_info->name)
+#endif
+                       )
+               {
+                   return if_info;
+               }
+           }
            ifn++;
        }
     }
     return NULL;
 }
 
-/*
- * Used to retrieve the interface given the name
- * (the name is used in AirpcapOpen)
- */
-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;
-
-    ifn = 0;
-    if(if_list != NULL)
-           {
-           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++;
-                   }
-           }
-    return NULL;
-}
-
 /*
  * Returns the ASCII string of a key given the key bytes
  */
@@ -1245,44 +1475,43 @@ gchar*
 airpcap_get_key_string(AirpcapKey key)
 {
     unsigned int j = 0;
-    unsigned int l = 0;
     gchar *dst,*src;
 
     dst = NULL;
     src = NULL;
 
     if(key.KeyType == AIRPDCAP_KEY_TYPE_WEP)
-           {
-           if(key.KeyLen != 0)
-               {
+    {
+       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++)
-                       {
-                       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);
-           }
+           for(j = 0; j < key.KeyLen; j++)
+           {
+               src = g_strdup_printf("%.2x", key.KeyData[j]);
+               /*
+                * XXX - use g_strconcat() or GStrings instead ???
+                */
+               g_strlcat(dst, src, WEP_KEY_MAX_CHAR_SIZE+1);
            }
+           g_free(src);
+       }
+    }
     else if(key.KeyType == AIRPDCAP_KEY_TYPE_WPA_PWD)
-       {
+    {
        /* XXX - Add code here */
-       }
+    }
     else if(key.KeyType == AIRPDCAP_KEY_TYPE_WPA_PMK)
-       {
+    {
        /* XXX - Add code here */
-       }
+    }
     else
-       {
+    {
        /* XXX - Add code here */
-       }
+    }
 
     return dst;
 }
@@ -1297,8 +1526,8 @@ airpcap_if_clear_decryption_settings(airpcap_if_info_t* info_if)
     {
        if(info_if->keysCollection != NULL)
        {
-               g_free(info_if->keysCollection);
-               info_if->keysCollection = NULL;
+           g_free(info_if->keysCollection);
+           info_if->keysCollection = NULL;
        }
 
        info_if->keysCollectionSize = 0;
@@ -1308,65 +1537,34 @@ airpcap_if_clear_decryption_settings(airpcap_if_info_t* info_if)
     }
 }
 
-/*
- * Used to retrieve the airpcap_if_info_t of the selected interface given the
- * description (that is the entry of the combo box).
- */
-gpointer get_airpcap_if_from_description(GList* if_list, const gchar* description)
-{
-    unsigned int ifn;
-    GList* curr;
-    airpcap_if_info_t* if_info;
-
-    ifn = 0;
-    if(if_list != NULL)
-           {
-           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++;
-                   }
-           }
-    return NULL;
-}
-
 /*
  * Used to retrieve the two chars string from interface
  */
 gchar*
 airpcap_get_if_string_number(airpcap_if_info_t* if_info)
 {
-       gchar* number;
-       guint n;
-       int a;
+    gchar* number;
+    guint n;
+    int a;
 
-       a = sscanf(if_info->name,AIRPCAP_DEVICE_NUMBER_EXTRACT_STRING,&n);
+    a = sscanf(if_info->name,AIRPCAP_DEVICE_NUMBER_EXTRACT_STRING,&n);
 
     /* If sscanf() returned 1, it means that has read a number, so interface is not "Any"
      * Otherwise, check if it is the "Any" adapter...
      */
-     if(a == 0)
-          {
-          if(g_strcasecmp(if_info->name,AIRPCAP_DEVICE_ANY_EXTRACT_STRING)!=0)
-               number = g_strdup_printf("??");
-          else
-               number = g_strdup_printf(AIRPCAP_CHANNEL_ANY_NAME);
-          }
-     else
-          {
-          number = g_strdup_printf("%.2u\0",n);
-          }
+    if(a == 0)
+    {
+       if(g_ascii_strcasecmp(if_info->name,AIRPCAP_DEVICE_ANY_EXTRACT_STRING)!=0)
+           number = g_strdup_printf("??");
+       else
+           number = g_strdup_printf(AIRPCAP_CHANNEL_ANY_NAME);
+    }
+    else
+    {
+       number = g_strdup_printf("%.2u",n);
+    }
 
-       return number;
+    return number;
 }
 
 /*
@@ -1375,18 +1573,18 @@ airpcap_get_if_string_number(airpcap_if_info_t* if_info)
 gchar*
 airpcap_get_if_string_number_from_description(gchar* description)
 {
-       gchar* number;
-       gchar* pointer;
+    gchar* number;
+    gchar* pointer;
 
-       number = (gchar*)g_malloc(sizeof(gchar)*3);
+    number = (gchar*)g_malloc(sizeof(gchar)*3);
 
-       pointer = g_strrstr(description,"#\0");
+    pointer = g_strrstr(description,"#\0");
 
-       number[0] = *(pointer+1);
-       number[1] = *(pointer+2);
-       number[2] = '\0';
+    number[0] = *(pointer+1);
+    number[1] = *(pointer+2);
+    number[2] = '\0';
 
-       return number;
+    return number;
 }
 
 /*
@@ -1395,20 +1593,16 @@ 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;
-
-       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)));
+       if_info = get_airpcap_if_from_name(airpcap_if_list,g_strdup(get_if_name(prefs.capture_device)));
        g_free(s);
     }
-       return if_info;
+    return if_info;
 }
 
 /*
@@ -1421,35 +1615,35 @@ airpcap_load_selected_if_configuration(airpcap_if_info_t* if_info)
     PAirpcapHandle ad;
 
     if(if_info != NULL)
-       {
-       ad = airpcap_if_open(get_airpcap_name_from_description(airpcap_if_list, if_info->description), ebuf);
+    {
+       ad = airpcap_if_open(if_info->name, ebuf);
 
        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);
-                       }
-
-               /* 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);
+       {
+           /* Stop blinking (if it was blinking!)*/
+           if(if_info->blinking)
+           {
+               /* Turn on the light (if it was off) */
+               if(!(if_info->led)) airpcap_if_turn_led_on(ad, 0);
+           }
 
-               if_info->saved = TRUE;
-               }
+           /* Apply settings... */
+           airpcap_if_get_device_channel_ex(ad,&(if_info->channelInfo));
+           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);
-               }
+       {
+           simple_dialog(ESD_TYPE_ERROR, ESD_BTN_OK, " Error in opening adapter for %s",if_info->description);
        }
+    }
 }
 
 /*
@@ -1463,41 +1657,41 @@ airpcap_save_selected_if_configuration(airpcap_if_info_t* if_info)
 
     if(if_info != NULL)
     {
-       ad = airpcap_if_open(get_airpcap_name_from_description(airpcap_if_list, if_info->description), ebuf);
+       ad = airpcap_if_open(if_info->name, ebuf);
 
        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);
-                       }
-
-               /* 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);
-
-               /* ... 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;
-                       }
+       {
+           /* Stop blinking (if it was blinking!)*/
+           if(if_info->blinking)
+           {
+               /* Turn on the light (if it was off) */
+               if(!(if_info->led)) airpcap_if_turn_led_on(ad, 0);
+           }
 
-               if_info->saved = TRUE;
+           /* Apply settings... */
+           airpcap_if_set_device_channel_ex(ad,if_info->channelInfo);
+           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);
+
+           /* ... 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;
+           }
+
+           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);
-               }
+       {
+           simple_dialog(ESD_TYPE_ERROR, ESD_BTN_OK, " Error in opening adapter for %s",if_info->description);
+       }
     }
 }
 
@@ -1515,16 +1709,16 @@ airpcap_save_driver_if_configuration(airpcap_if_info_t* fake_if_info)
        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);
-               }
+       {
+           /* 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);
-               }
+       {
+           simple_dialog(ESD_TYPE_ERROR, ESD_BTN_OK, " Error in opening adapter for %s",fake_if_info->description);
+       }
     }
 
     return;
@@ -1544,8 +1738,8 @@ print_key_list(GList* key_list)
 
     if(key_list == NULL)
     {
-    g_print("\n\n******* KEY LIST NULL *******\n\n");
-    return;
+       g_print("\n\n******* KEY LIST NULL *******\n\n");
+       return;
     }
 
     n = g_list_length(key_list);
@@ -1556,24 +1750,24 @@ print_key_list(GList* key_list)
 
     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 == AIRPDCAP_KEY_TYPE_WEP)
-       g_print("TYPE: %s\n",AIRPCAP_WEP_KEY_STRING);
-    else if(tmp->type == AIRPDCAP_KEY_TYPE_WPA_PWD)
-       g_print("TYPE: %s\n",AIRPCAP_WPA_PWD_KEY_STRING);
-    else if(tmp->type == AIRPDCAP_KEY_TYPE_WPA_PMK)
-       g_print("TYPE: %s\n",AIRPCAP_WPA_BIN_KEY_STRING);
-    else
-       g_print("TYPE: %s\n","???");
+       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 == AIRPDCAP_KEY_TYPE_WEP)
+           g_print("TYPE: %s\n",AIRPCAP_WEP_KEY_STRING);
+       else if(tmp->type == AIRPDCAP_KEY_TYPE_WPA_PWD)
+           g_print("TYPE: %s\n",AIRPCAP_WPA_PWD_KEY_STRING);
+       else if(tmp->type == AIRPDCAP_KEY_TYPE_WPA_PMK)
+           g_print("TYPE: %s\n",AIRPCAP_WPA_BIN_KEY_STRING);
+       else
+           g_print("TYPE: %s\n","???");
 
-    g_print("SSID: %s\n",(tmp->ssid != NULL) ?
-           format_text((guchar *)tmp->ssid->data, tmp->ssid->len) : "---");
-    g_print("\n");
+       g_print("SSID: %s\n",(tmp->ssid != NULL) ?
+               format_text((guchar *)tmp->ssid->data, tmp->ssid->len) : "---");
+       g_print("\n");
     }
 
     g_print("\n*****************************\n\n");
@@ -1602,37 +1796,37 @@ get_airpcap_device_keys(airpcap_if_info_t* info_if)
 
     for(i=0; i<keys_in_list; i++)
     {
-    /* Different things to do depending on the key type  */
-    if(info_if->keysCollection->Keys[i].KeyType == AIRPDCAP_KEY_TYPE_WEP)
+       /* Different things to do depending on the key type  */
+       if(info_if->keysCollection->Keys[i].KeyType == AIRPDCAP_KEY_TYPE_WEP)
        {
-       /* allocate memory for the new key item */
-       new_key = (decryption_key_t*)g_malloc(sizeof(decryption_key_t));
+           /* 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 = (guint) new_key->key->len *4; /* every char is 4 bits in WEP keys (it is an hexadecimal 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);
+           /* 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 == AIRPDCAP_KEY_TYPE_WPA_PWD)
+       else if(info_if->keysCollection->Keys[i].KeyType == AIRPDCAP_KEY_TYPE_WPA_PWD)
        {
-       /* XXX - Not supported yet */
+           /* XXX - Not supported yet */
        }
-    else if(info_if->keysCollection->Keys[i].KeyType == AIRPDCAP_KEY_TYPE_WPA_PMK)
+       else if(info_if->keysCollection->Keys[i].KeyType == AIRPDCAP_KEY_TYPE_WPA_PMK)
        {
-       /* XXX - Not supported yet */
+           /* XXX - Not supported yet */
        }
     }
 
@@ -1644,7 +1838,7 @@ get_airpcap_device_keys(airpcap_if_info_t* info_if)
  * keys for the global AirPcap driver... returns NULL if no keys are found.
  */
 GList*
-get_airpcap_driver_keys()
+get_airpcap_driver_keys(void)
 {
     /* tmp vars */
     char* tmp_key = NULL;
@@ -1664,7 +1858,7 @@ get_airpcap_driver_keys()
     fake_info_if = airpcap_driver_fake_if_info_new();
 
     if(fake_info_if == NULL)
-           return NULL;
+       return NULL;
 
     /* Number of keys in key list */
     if(fake_info_if->keysCollectionSize != 0)
@@ -1674,37 +1868,37 @@ get_airpcap_driver_keys()
 
     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 == AIRPDCAP_KEY_TYPE_WEP)
+       /* Different things to do depending on the key type  */
+       if(fake_info_if->keysCollection->Keys[i].KeyType == AIRPDCAP_KEY_TYPE_WEP)
        {
-       /* allocate memory for the new key item */
-       new_key = (decryption_key_t*)g_malloc(sizeof(decryption_key_t));
+           /* 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(fake_info_if->keysCollection->Keys[i]);
-       new_key->key = g_string_new(tmp_key);
-       if(tmp_key != NULL) g_free(tmp_key);
+           /* fill the fields */
+           /* KEY */
+           tmp_key = airpcap_get_key_string(fake_info_if->keysCollection->Keys[i]);
+           new_key->key = g_string_new(tmp_key);
+           if(tmp_key != NULL) 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 = (guint) new_key->key->len *4; /* every char is 4 bits in WEP keys (it is an hexadecimal 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 = fake_info_if->keysCollection->Keys[i].KeyType;
+           /* TYPE (WEP in this case) */
+           new_key->type = fake_info_if->keysCollection->Keys[i].KeyType;
 
-       /* Append the new element in the list */
-       key_list = g_list_append(key_list,(gpointer)new_key);
+           /* 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 == AIRPDCAP_KEY_TYPE_WPA_PWD)
+       else if(fake_info_if->keysCollection->Keys[i].KeyType == AIRPDCAP_KEY_TYPE_WPA_PWD)
        {
-       /* XXX - Not supported yet */
+           /* XXX - Not supported yet */
        }
-    else if(fake_info_if->keysCollection->Keys[i].KeyType == AIRPDCAP_KEY_TYPE_WPA_PMK)
+       else if(fake_info_if->keysCollection->Keys[i].KeyType == AIRPDCAP_KEY_TYPE_WPA_PMK)
        {
-       /* XXX - Not supported yet */
+           /* XXX - Not supported yet */
        }
     }
 
@@ -1718,12 +1912,10 @@ get_airpcap_driver_keys()
  * no key is found
  */
 GList*
-get_wireshark_keys()
+get_wireshark_keys(void)
 {
     keys_cb_data_t* wep_user_data = NULL;
 
-    gchar *tmp = NULL;
-
     GList* final_list = NULL;
     GList* wep_final_list = NULL;
 
@@ -1767,8 +1959,8 @@ merge_key_list(GList* list1, GList* list2)
     guint n1=0,n2=0;
     guint i;
     decryption_key_t *dk1=NULL,
-                    *dk2=NULL,
-                    *new_dk=NULL;
+                     *dk2=NULL,
+                     *new_dk=NULL;
 
     GList* merged_list = NULL;
 
@@ -1812,7 +2004,7 @@ merge_key_list(GList* list1, GList* 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);
+               merged_list = g_list_append(merged_list,(gpointer)new_dk);
        }
     }
     else
@@ -1829,7 +2021,7 @@ merge_key_list(GList* list1, GList* list2)
            new_dk->bits = dk1->bits;
            new_dk->type = dk1->type;
            new_dk->key  = g_string_new(dk1->key->str);
-           new_dk->ssid = g_byte_array_dup(dk1->ssid);
+           new_dk->ssid = byte_array_dup(dk1->ssid);
 
            /* Check the total length of the merged list */
            if(g_list_length(merged_list) < MAX_ENCRYPTION_KEYS)
@@ -1854,7 +2046,7 @@ merge_key_list(GList* list1, GList* 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);
+                   merged_list = g_list_append(merged_list,(gpointer)new_dk);
            }
        }
     }
@@ -1920,9 +2112,9 @@ key_is_in_list(decryption_key_t *dk,GList *list)
 
     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;
+       curr_key = (decryption_key_t*)g_list_nth_data(list,i);
+       if(keys_are_equals(dk,curr_key))
+           found = TRUE;
     }
 
     return found;
@@ -1939,8 +2131,8 @@ keys_are_equals(decryption_key_t *k1,decryption_key_t *k2)
        return FALSE;
 
     /* XXX - Remove this check when we will have the WPA/WPA2 decryption in the Driver! */
-    //if( (k1->type == AIRPDCAP_KEY_TYPE_WPA_PWD) || (k2->type == AIRPDCAP_KEY_TYPE_WPA_PWD) || (k1->type == AIRPDCAP_KEY_TYPE_WPA_PMK) || (k2->type == AIRPDCAP_KEY_TYPE_WPA_PMK) )
-    // return TRUE;
+    /** if( (k1->type == AIRPDCAP_KEY_TYPE_WPA_PWD) || (k2->type == AIRPDCAP_KEY_TYPE_WPA_PWD) || (k1->type == AIRPDCAP_KEY_TYPE_WPA_PMK) || (k2->type == AIRPDCAP_KEY_TYPE_WPA_PMK) ) **/
+    /**        return TRUE;  **/
 
     if( g_string_equal(k1->key,k2->key) &&
        (k1->bits == k2->bits) && /* If the previous is TRUE, this must be TRUE as well */
@@ -1980,26 +2172,26 @@ key_lists_are_equal(GList* list1, GList* list2)
 
     /*
      * XXX - START : Retrieve the aublists of WEP keys!!! This is needed only 'till Driver WPA decryption
-     * is not implemented.
+     * is implemented.
      */
     for(i=0;i<n1;i++)
-           {
-           dk1=(decryption_key_t*)g_list_nth_data(list1,i);
-           if(dk1->type == AIRPDCAP_KEY_TYPE_WEP)
-                   {
-                   wep_list1 = g_list_append(wep_list1,(gpointer)dk1);
-                   wep_n1++;
-                   }
-           }
+    {
+       dk1=(decryption_key_t*)g_list_nth_data(list1,i);
+       if(dk1->type == AIRPDCAP_KEY_TYPE_WEP)
+       {
+           wep_list1 = g_list_append(wep_list1,(gpointer)dk1);
+           wep_n1++;
+       }
+    }
     for(i=0;i<n2;i++)
-           {
-           dk2=(decryption_key_t*)g_list_nth_data(list2,i);
-           if(dk2->type == AIRPDCAP_KEY_TYPE_WEP)
-                   {
-                   wep_list2 = g_list_append(wep_list2,(gpointer)dk2);
-                   wep_n2++;
-                   }
-           }
+    {
+       dk2=(decryption_key_t*)g_list_nth_data(list2,i);
+       if(dk2->type == AIRPDCAP_KEY_TYPE_WEP)
+       {
+           wep_list2 = g_list_append(wep_list2,(gpointer)dk2);
+           wep_n2++;
+       }
+    }
 
     /*
      * XXX - END : Remove from START to END when the WPA/WPA2 decryption will be implemented in
@@ -2027,15 +2219,15 @@ key_lists_are_equal(GList* list1, GList* list2)
     }*/
     for(i=0;i<n2;i++)
     {
-    dk2=(decryption_key_t*)g_list_nth_data(wep_list2,i);
-    if(!key_is_in_list(dk2,wep_list1)) return FALSE;
+       dk2=(decryption_key_t*)g_list_nth_data(wep_list2,i);
+       if(!key_is_in_list(dk2,wep_list1)) return FALSE;
     }
 
     return TRUE;
 }
 
 static guint
-test_if_on(pref_t *pref, gpointer ud _U_)
+test_if_on(pref_t *pref, gpointer ud)
 {
     gboolean *is_on;
     gboolean number;
@@ -2044,15 +2236,15 @@ test_if_on(pref_t *pref, gpointer ud _U_)
     is_on = (gboolean*)ud;
 
 
-    if (g_strncasecmp(pref->name, "enable_decryption", 17) == 0 && pref->type == PREF_BOOL)
-       {
+    if (g_ascii_strncasecmp(pref->name, "enable_decryption", 17) == 0 && pref->type == PREF_BOOL)
+    {
        number = *pref->varp.boolp;
 
        if(number) *is_on = TRUE;
        else *is_on = FALSE;
 
        return 1;
-       }
+    }
     return 0;
 }
 
@@ -2060,7 +2252,7 @@ test_if_on(pref_t *pref, gpointer ud _U_)
  * Returns TRUE if the Wireshark decryption is active, false otherwise
  */
 gboolean
-wireshark_decryption_on()
+wireshark_decryption_on(void)
 {
     gboolean is_on;
 
@@ -2077,7 +2269,7 @@ wireshark_decryption_on()
  * Returns TRUE if the AirPcap decryption for the current adapter is active, false otherwise
  */
 gboolean
-airpcap_decryption_on()
+airpcap_decryption_on(void)
 {
     gboolean is_on = FALSE;
 
@@ -2086,12 +2278,12 @@ airpcap_decryption_on()
     fake_if_info = airpcap_driver_fake_if_info_new();
 
     if(fake_if_info != NULL)
-       {
-           if(fake_if_info->DecryptionOn == AIRPCAP_DECRYPTION_ON)
-                   is_on = TRUE;
-           else if(fake_if_info->DecryptionOn == AIRPCAP_DECRYPTION_OFF)
-                   is_on = FALSE;
-       }
+    {
+       if(fake_if_info->DecryptionOn == AIRPCAP_DECRYPTION_ON)
+           is_on = TRUE;
+       else if(fake_if_info->DecryptionOn == AIRPCAP_DECRYPTION_OFF)
+           is_on = FALSE;
+    }
 
     airpcap_if_info_free(fake_if_info);
 
@@ -2107,33 +2299,33 @@ airpcap_if_info_free(airpcap_if_info_t *if_info)
     if(if_info != NULL)
     {
        if (if_info->name != NULL)
-               g_free(if_info->name);
+           g_free(if_info->name);
 
        if (if_info->description != NULL)
-               g_free(if_info->description);
+           g_free(if_info->description);
 
        if(if_info->keysCollection != NULL)
-               {
-               g_free(if_info->keysCollection);
-               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;
-               }
+       {
+           g_slist_free(if_info->ip_addr);
+           if_info->ip_addr = NULL;
+       }
 
        if(if_info != NULL)
-               {
-               g_free(if_info);
-               if_info = NULL;
-               }
+       {
+           g_free(if_info);
+           if_info = NULL;
+       }
     }
 }
 
 static guint
-set_on_off(pref_t *pref, gpointer ud _U_)
+set_on_off(pref_t *pref, gpointer ud)
 {
     gboolean *is_on;
     gboolean number;
@@ -2141,18 +2333,17 @@ set_on_off(pref_t *pref, gpointer ud _U_)
     /* Retrieve user data info */
     is_on = (gboolean*)ud;
 
-    if (g_strncasecmp(pref->name, "enable_decryption", 17) == 0 && pref->type == PREF_BOOL)
-       {
+    if (g_ascii_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;
 
        return 1;
-       }
+    }
     return 0;
 }
 
@@ -2187,36 +2378,36 @@ set_wireshark_decryption(gboolean on_off)
 gboolean
 set_airpcap_decryption(gboolean on_off)
 {
-       /* We need to directly access the .dll functions here... */
-       gchar ebuf[AIRPCAP_ERRBUF_SIZE];
-       PAirpcapHandle ad,ad_driver;
+    /* We need to directly access the .dll functions here... */
+    gchar ebuf[AIRPCAP_ERRBUF_SIZE];
+    PAirpcapHandle ad,ad_driver;
 
-       gboolean success = TRUE;
+    gboolean success = TRUE;
 
-       gint n = 0;
-       gint i = 0;
-       airpcap_if_info_t* curr_if = NULL;
-       airpcap_if_info_t* fake_if_info = NULL;
+    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();
+    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;
+    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_driver)
-               {
-               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);
+       {
+           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_close(ad_driver);
+       }
 
        airpcap_if_info_free(fake_if_info);
 
@@ -2225,25 +2416,25 @@ set_airpcap_decryption(gboolean on_off)
        /* Set to FALSE the decryption for all the adapters */
        /* Apply this change to all the adapters !!! */
        for(i = 0; i < n; i++)
-           {
+       {
            curr_if = (airpcap_if_info_t*)g_list_nth_data(airpcap_if_list,i);
 
            if( curr_if != NULL )
+           {
+               ad = airpcap_if_open(curr_if->name, ebuf);
+               if(ad)
                {
-               ad = airpcap_if_open(get_airpcap_name_from_description(airpcap_if_list,curr_if->description), ebuf);
-                       if(ad)
-                   {
                    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))
-                               {
-                               success = FALSE;
-                               }
-                       airpcap_if_close(ad);
+                   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))
+                   {
+                       success = FALSE;
                    }
+                   airpcap_if_close(ad);
                }
            }
+       }
 
        return success;
 }
@@ -2256,70 +2447,72 @@ set_airpcap_decryption(gboolean on_off)
  */
 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 AIRPCAP_DLL_NOT_FOUND;
- }
- else
- {
-  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;
-  }
- }
+#ifdef _WIN32
+    gboolean base_functions = TRUE;
+    gboolean eleven_n_functions = TRUE;
+
+    if((AirpcapLib = ws_load_library("airpcap.dll")) == NULL)
+    {
+               /* Report the error but go on */
+               AirpcapVersion = AIRPCAP_DLL_NOT_FOUND;
+               return AirpcapVersion;
+    }
+    else
+    {
+               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;
+               if((g_PAirpcapGetDriverDecryptionState = (AirpcapGetDriverDecryptionStateHandler) GetProcAddress(AirpcapLib, "AirpcapGetDriverDecryptionState")) == NULL) base_functions = FALSE;
+               if((g_PAirpcapSetDriverDecryptionState = (AirpcapSetDriverDecryptionStateHandler) GetProcAddress(AirpcapLib, "AirpcapSetDriverDecryptionState")) == NULL) base_functions = FALSE;
+               if((g_PAirpcapGetDriverKeys = (AirpcapGetDriverKeysHandler) GetProcAddress(AirpcapLib, "AirpcapGetDriverKeys")) == NULL) base_functions = FALSE;
+               if((g_PAirpcapSetDriverKeys = (AirpcapSetDriverKeysHandler) GetProcAddress(AirpcapLib, "AirpcapSetDriverKeys")) == NULL) base_functions = FALSE;
+
+               /* TEST IF AIRPCAP SUPPORTS 11N */
+               if((g_PAirpcapSetDeviceChannelEx = (AirpcapSetDeviceChannelExHandler) GetProcAddress(AirpcapLib, "AirpcapSetDeviceChannelEx")) == NULL) eleven_n_functions = FALSE;
+               if((g_PAirpcapGetDeviceChannelEx = (AirpcapGetDeviceChannelExHandler) GetProcAddress(AirpcapLib, "AirpcapGetDeviceChannelEx")) == NULL) eleven_n_functions = FALSE;
+               if((g_PAirpcapGetDeviceSupportedChannels = (AirpcapGetDeviceSupportedChannelsHandler) GetProcAddress(AirpcapLib, "AirpcapGetDeviceSupportedChannels")) == NULL) eleven_n_functions = FALSE;
+
+               if(base_functions && eleven_n_functions){
+                       AirpcapLoaded = TRUE;
+                       AirpcapVersion = AIRPCAP_DLL_OK;
+               }else if(base_functions){
+                       AirpcapLoaded = TRUE;
+                       AirpcapVersion = AIRPCAP_DLL_OLD;
+                       return AIRPCAP_DLL_OK;
+               }else{
+                       AirpcapLoaded = FALSE;
+                       AirpcapVersion = AIRPCAP_DLL_ERROR;
+               }
+    }
+    return AirpcapVersion;
+#else /* _WIN32 */
+    return AIRPCAP_DLL_NOT_FOUND;
+#endif /* _WIN32 */
 }
 
 /*
@@ -2328,7 +2521,7 @@ BOOL new_functions = TRUE;
 void
 get_compiled_airpcap_version(GString *str)
 {
-       g_string_append(str, "with AirPcap");
+    g_string_append(str, "with AirPcap");
 }
 
 /*
@@ -2337,17 +2530,16 @@ get_compiled_airpcap_version(GString *str)
 void
 get_runtime_airpcap_version(GString *str)
 {
-       guint vmaj, vmin, vrev, build;
+    guint vmaj, vmin, vrev, build;
 
-       /* See if the DLL has been loaded successfully.  Bail if it hasn't */
-       if (AirpcapLoaded == FALSE) {
-               g_string_append(str, "without AirPcap");
-               return;
-       }
+    /* See if the DLL has been loaded successfully.  Bail if it hasn't */
+    if (AirpcapLoaded == FALSE) {
+       g_string_append(str, "without AirPcap");
+       return;
+    }
 
-       g_PAirpcapGetVersion(&vmaj, &vmin, &vrev, &build);
-       g_string_sprintfa(str, "with AirPcap %d.%d.%d build %d", vmaj, vmin,
-               vrev, build);
+    g_PAirpcapGetVersion(&vmaj, &vmin, &vrev, &build);
+    g_string_append_printf(str, "with AirPcap %d.%d.%d build %d", vmaj, vmin,
+       vrev, build);
 }
-
-#endif /* _WIN32 */
+#endif /* HAVE_AIRPCAP */