cd ../gtk ==> cd ../ui/gtk
[obnox/wireshark/wip.git] / airpcap_loader.c
index e01b6bc792462598de32c0b2c4858922d230fe79..17241dc98adcf00b93c7cbba50674f089f19215b 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 dynamically 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,13 +120,37 @@ 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;
+    gchar *key_string = NULL;
+    guint8 key_type = AIRPDCAP_KEY_TYPE_WEP;
     keys_cb_data_t* user_data;
 
     decryption_key_t* new_key;
@@ -123,20 +158,35 @@ 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);
+        /* strip out key type */
+        if (g_ascii_strncasecmp(*pref->varp.string, STRING_KEY_TYPE_WEP ":", 4) == 0) {
+              key_string = (gchar*)(*pref->varp.string)+4;
+        }
+        else if (g_ascii_strncasecmp(*pref->varp.string, STRING_KEY_TYPE_WPA_PWD ":", 8) == 0) {
+              key_string = (gchar*)(*pref->varp.string)+8;
+          key_type = AIRPDCAP_KEY_TYPE_WPA_PWD;
+        }
+        else if (g_ascii_strncasecmp(*pref->varp.string, STRING_KEY_TYPE_WPA_PSK ":", 8) == 0) {
+              key_string = (gchar*)(*pref->varp.string)+8;
+          key_type = AIRPDCAP_KEY_TYPE_WPA_PSK;
+        }
+        else {
+          key_type = AIRPDCAP_KEY_TYPE_WEP;
+              key_string = (gchar*)*pref->varp.string;
+        }
 
            /* Here we have the string describing the key... */
-           new_key = parse_key_string(my_string);
+           new_key = parse_key_string(key_string, key_type);
 
-       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++;
-       }
+           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++;
+           }
     }
     return 0;
 }
@@ -189,7 +239,7 @@ 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);
@@ -231,12 +281,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");
@@ -286,16 +335,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
+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);
@@ -332,7 +381,7 @@ write_wlan_wep_keys_to_registry(airpcap_if_info_t* info_if, GList* key_list)
        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;
+       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)
@@ -340,7 +389,7 @@ write_wlan_wep_keys_to_registry(airpcap_if_info_t* info_if, 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[i].KeyData[j / 2] = KeyByte;
        }
 
@@ -376,16 +425,16 @@ write_wlan_wep_keys_to_registry(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
+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;
 
@@ -442,10 +491,10 @@ write_wlan_driver_wep_keys_to_registry(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 +502,7 @@ write_wlan_driver_wep_keys_to_registry(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 +510,7 @@ write_wlan_driver_wep_keys_to_registry(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!!! */
@@ -509,7 +558,7 @@ write_wlan_driver_wep_keys_to_registry(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 +570,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 +578,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);
@@ -593,10 +641,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 */
@@ -658,7 +704,7 @@ cant_get_airpcap_if_list_error_message(const char *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;
@@ -669,7 +715,7 @@ airpcap_if_store_cur_config_as_adapter_default(PAirpcapHandle 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;
@@ -679,18 +725,27 @@ airpcap_if_open(PCHAR name, PCHAR err)
 /*
  * Airpcap wrapper, used to close an airpcap adapter
  */
-VOID
+void
 airpcap_if_close(PAirpcapHandle 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);
@@ -699,8 +754,8 @@ airpcap_if_turn_led_on(PAirpcapHandle AdapterHandle, UINT 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);
@@ -709,27 +764,211 @@ airpcap_if_turn_led_off(PAirpcapHandle AdapterHandle, UINT 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);
 }
 
+/*
+ * 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);
 }
 
+/*
+ * 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;
@@ -739,7 +978,7 @@ airpcap_if_get_link_type(PAirpcapHandle ah, PAirpcapLinkType 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;
@@ -749,8 +988,8 @@ airpcap_if_set_link_type(PAirpcapHandle ah, AirpcapLinkType 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);
@@ -759,8 +998,8 @@ airpcap_if_get_fcs_presence(PAirpcapHandle ah, PBOOL 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);
@@ -769,7 +1008,7 @@ airpcap_if_set_fcs_presence(PAirpcapHandle ah, BOOL 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;
@@ -779,7 +1018,7 @@ airpcap_if_get_decryption_state(PAirpcapHandle ah, PAirpcapDecryptionState PEnab
 /*
  * 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;
@@ -789,7 +1028,7 @@ airpcap_if_set_decryption_state(PAirpcapHandle ah, AirpcapDecryptionState 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;
@@ -799,7 +1038,7 @@ airpcap_if_get_driver_decryption_state(PAirpcapHandle ah, PAirpcapDecryptionStat
 /*
  * 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;
@@ -809,7 +1048,7 @@ airpcap_if_set_driver_decryption_state(PAirpcapHandle ah, AirpcapDecryptionState
 /*
  * 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;
@@ -819,7 +1058,7 @@ airpcap_if_get_fcs_validation(PAirpcapHandle ah, PAirpcapValidationType 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;
@@ -829,7 +1068,7 @@ airpcap_if_set_fcs_validation(PAirpcapHandle ah, AirpcapValidationType 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;
@@ -839,8 +1078,8 @@ airpcap_if_set_device_keys(PAirpcapHandle AdapterHandle, PAirpcapKeysCollection
 /*
  * 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);
@@ -849,7 +1088,7 @@ airpcap_if_get_device_keys(PAirpcapHandle AdapterHandle, PAirpcapKeysCollection
 /*
  * 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;
@@ -859,8 +1098,8 @@ airpcap_if_set_driver_keys(PAirpcapHandle AdapterHandle, PAirpcapKeysCollection
 /*
  * 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);
@@ -881,29 +1120,32 @@ airpcap_if_info_new(char *name, char *description)
     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 */
-
-       /* get the keys, if everything is ok, close the adapter */
-       if(airpcap_if_load_keys(ad,if_info))
-       {
-           airpcap_if_close(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;
 }
@@ -912,7 +1154,7 @@ airpcap_if_info_new(char *name, char *description)
  * This function will create a new fake drivers' interface, to load global keys...
  */
 airpcap_if_info_t*
-airpcap_driver_fake_if_info_new()
+airpcap_driver_fake_if_info_new(void)
 {
     PAirpcapHandle ad;
     gchar ebuf[AIRPCAP_ERRBUF_SIZE];
@@ -936,26 +1178,26 @@ airpcap_driver_fake_if_info_new()
     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_turn_led_on(ad, 0);
-       fake_if_info->led = TRUE;
-       fake_if_info->blinking = FALSE;
-       fake_if_info->saved = TRUE; /* NO NEED TO BE SAVED */
-
-       /* get the keys, if everything is ok, close the adapter */
-       if(airpcap_if_load_driver_keys(ad,fake_if_info))
-       {
-           airpcap_if_close(ad);
-       }
+               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_ex(ad,&(fake_if_info->channelInfo));
+               airpcap_if_turn_led_on(ad, 0);
+               fake_if_info->led = TRUE;
+               fake_if_info->blinking = FALSE;
+               fake_if_info->saved = TRUE; /* NO NEED TO BE SAVED */
+
+               /* get the keys, if everything is ok, close the adapter */
+               if(airpcap_if_load_driver_keys(ad,fake_if_info))
+               {
+                       airpcap_if_close(ad);
+               }
     }
 
     return fake_if_info;
@@ -967,34 +1209,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;
@@ -1031,7 +1284,7 @@ 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;
@@ -1133,23 +1386,25 @@ 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 (!AirpcapLoaded)
     {
-       *err = AIRPCAP_NOT_LOADED;
-       return il;
+               *err = AIRPCAP_NOT_LOADED;
+               return il;
     }
 
     if (!g_PAirpcapGetDeviceList(&devsList, errbuf))
     {
-       /* 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;
+               /* 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;
     }
 
     /*
@@ -1165,96 +1420,49 @@ get_airpcap_interface_list(int *err, char **err_str)
 
     if(n_adapts == 0)
     {
-       /* No interfaces, return il= NULL */
-       g_PAirpcapFreeDeviceList(devsList);
-       *err = NO_AIRPCAP_INTERFACES_FOUND;
-       if (err_str != NULL)
-           *err_str = NULL;
-       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);
 
-    *err = 0;
     return il;
 }
 
-/*
- * 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)
- */
-gchar* get_airpcap_name_from_description(GList* if_list, 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->name;
-               }
-           }
-           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)
+airpcap_if_info_t* get_airpcap_if_from_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);
+       GList* curr;
+       airpcap_if_info_t* if_info;
 
-           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;
+       for (curr = g_list_first(if_list); curr; curr = g_list_next(curr)) {
+               if_info = (airpcap_if_info_t *)curr->data;
+               if (if_info && (g_ascii_strcasecmp(if_info->name, name) == 0)) {
+                       return (if_info);
                }
-           }
-           ifn++;
        }
-    }
-    return NULL;
+       return (NULL);
 }
 
 /*
@@ -1264,7 +1472,6 @@ gchar*
 airpcap_get_key_string(AirpcapKey key)
 {
     unsigned int j = 0;
-    unsigned int l = 0;
     gchar *dst,*src;
 
     dst = NULL;
@@ -1281,11 +1488,11 @@ airpcap_get_key_string(AirpcapKey key)
 
            for(j = 0; j < key.KeyLen; j++)
            {
-               src = g_strdup_printf("%.2x\0", key.KeyData[j]);
+               src = g_strdup_printf("%.2x", key.KeyData[j]);
                /*
                 * XXX - use g_strconcat() or GStrings instead ???
                 */
-               l = g_strlcat(dst,src,WEP_KEY_MAX_CHAR_SIZE+1);
+               g_strlcat(dst, src, WEP_KEY_MAX_CHAR_SIZE+1);
            }
            g_free(src);
        }
@@ -1327,39 +1534,6 @@ 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
  */
@@ -1377,14 +1551,14 @@ airpcap_get_if_string_number(airpcap_if_info_t* if_info)
      */
     if(a == 0)
     {
-       if(g_strcasecmp(if_info->name,AIRPCAP_DEVICE_ANY_EXTRACT_STRING)!=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\0",n);
+       number = g_strdup_printf("%.2u",n);
     }
 
     return number;
@@ -1416,17 +1590,13 @@ 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;
 
     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;
@@ -1443,11 +1613,11 @@ airpcap_load_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!)*/
+           /* Stop blinking (if it was blinking!)*/
            if(if_info->blinking)
            {
                /* Turn on the light (if it was off) */
@@ -1455,7 +1625,7 @@ airpcap_load_selected_if_configuration(airpcap_if_info_t* if_info)
            }
 
            /* Apply settings... */
-           airpcap_if_get_device_channel(ad,&(if_info->channel));
+           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));
@@ -1484,11 +1654,11 @@ 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!)*/
+           /* Stop blinking (if it was blinking!)*/
            if(if_info->blinking)
            {
                /* Turn on the light (if it was off) */
@@ -1496,7 +1666,7 @@ airpcap_save_selected_if_configuration(airpcap_if_info_t* if_info)
            }
 
            /* Apply settings... */
-           airpcap_if_set_device_channel(ad,if_info->channel);
+           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);
@@ -1636,7 +1806,7 @@ get_airpcap_device_keys(airpcap_if_info_t* info_if)
            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) */
+           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;
@@ -1665,7 +1835,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;
@@ -1708,7 +1878,7 @@ get_airpcap_driver_keys()
            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) */
+           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;
@@ -1739,12 +1909,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;
 
@@ -1960,8 +2128,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 */
@@ -2001,7 +2169,7 @@ 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++)
     {
@@ -2056,7 +2224,7 @@ key_lists_are_equal(GList* list1, GList* list2)
 }
 
 static guint
-test_if_on(pref_t *pref, gpointer ud _U_)
+test_if_on(pref_t *pref, gpointer ud)
 {
     gboolean *is_on;
     gboolean number;
@@ -2065,7 +2233,7 @@ 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;
 
@@ -2079,9 +2247,10 @@ test_if_on(pref_t *pref, gpointer ud _U_)
 
 /*
  * Returns TRUE if the Wireshark decryption is active, false otherwise
+ * XXX - Should we just add a routine to packet-ieee80211.c to grab this directly?
  */
 gboolean
-wireshark_decryption_on()
+wireshark_decryption_on(void)
 {
     gboolean is_on;
 
@@ -2098,7 +2267,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;
 
@@ -2154,7 +2323,7 @@ airpcap_if_info_free(airpcap_if_info_t *if_info)
 }
 
 static guint
-set_on_off(pref_t *pref, gpointer ud _U_)
+set_on_off(pref_t *pref, gpointer ud)
 {
     gboolean *is_on;
     gboolean number;
@@ -2162,11 +2331,10 @@ 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
@@ -2251,7 +2419,7 @@ set_airpcap_decryption(gboolean on_off)
 
            if( curr_if != NULL )
            {
-               ad = airpcap_if_open(get_airpcap_name_from_description(airpcap_if_list,curr_if->description), ebuf);
+               ad = airpcap_if_open(curr_if->name, ebuf);
                if(ad)
                {
                    curr_if->DecryptionOn = (gboolean)AIRPCAP_DECRYPTION_OFF;
@@ -2277,70 +2445,72 @@ set_airpcap_decryption(gboolean on_off)
  */
 int load_airpcap(void)
 {
-    BOOL base_functions = TRUE;
-    BOOL new_functions = TRUE;
+#ifdef _WIN32
+    gboolean base_functions = TRUE;
+    gboolean eleven_n_functions = TRUE;
 
-    if((AirpcapLib =  LoadLibrary(TEXT("airpcap.dll"))) == NULL)
+    if((AirpcapLib = ws_load_library("airpcap.dll")) == NULL)
     {
-       /* Report the error but go on */
-       return AIRPCAP_DLL_NOT_FOUND;
+               /* 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;
-
-       /* 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;
-       }
+               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 */
 }
 
 /*
@@ -2367,8 +2537,7 @@ get_runtime_airpcap_version(GString *str)
     }
 
     g_PAirpcapGetVersion(&vmaj, &vmin, &vrev, &build);
-    g_string_sprintfa(str, "with AirPcap %d.%d.%d build %d", vmaj, vmin,
+    g_string_append_printf(str, "with AirPcap %d.%d.%d build %d", vmaj, vmin,
        vrev, build);
 }
-
-#endif /* _WIN32 */
+#endif /* HAVE_AIRPCAP */