It's not an error if we don't find any AirPcap interfaces when AirPcap isn't

loaded.


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

1 files changed, 632 insertions, 619 deletions

diff --git a/airpcap_loader.c b/airpcap_loader.c
index 1c63b20d1b..b17aabf348 100644
--- a/airpcap_loader.c
+++ b/airpcap_loader.c
@@ -124,20 +124,20 @@ get_wep_key(pref_t *pref, gpointer ud _U_)
     user_data = (keys_cb_data_t*)ud;
 
     if (g_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 +149,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;
@@ -190,39 +190,39 @@ set_wep_key(pref_t *pref, gpointer ud _U_)
     user_data = (keys_cb_data_t*)ud;
 
     if (g_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;
 }
@@ -267,9 +267,9 @@ load_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);
@@ -316,7 +316,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 +328,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 = 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 = (UCHAR)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
@@ -393,7 +393,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 +401,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 +420,7 @@ write_wlan_driver_wep_keys_to_regitry(GList* key_list)
     KeysCollection = (PAirpcapKeysCollection)g_malloc(KeysCollectionSize);
     if(!KeysCollection)
     {
-	    return FALSE;
+	return FALSE;
     }
 
     /*
@@ -470,11 +470,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 +482,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
@@ -521,7 +521,7 @@ save_wlan_driver_wep_keys()
     fake_info_if = airpcap_driver_fake_if_info_new();
 
     if(fake_info_if == NULL)
-	    return FALSE;
+	return FALSE;
 
     /* Retrieve the wlan preferences */
     wlan_prefs = prefs_find_module("wlan");
@@ -539,11 +539,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 +571,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);
@@ -630,11 +630,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);
@@ -652,7 +652,7 @@ save_wlan_wireshark_wep_keys(GList* key_ls)
 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);
 }
 
 /*
@@ -661,8 +661,8 @@ cant_get_airpcap_if_list_error_message(const char *err_str)
 BOOL
 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);
 }
 
 /*
@@ -671,9 +671,9 @@ airpcap_if_store_cur_config_as_adapter_default(PAirpcapHandle ah)
 PAirpcapHandle
 airpcap_if_open(PCHAR name, PCHAR 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);
 }
 
 /*
@@ -682,8 +682,8 @@ airpcap_if_open(PCHAR name, PCHAR err)
 VOID
 airpcap_if_close(PAirpcapHandle handle)
 {
-	if (!AirpcapLoaded) return;
-	g_PAirpcapClose(handle);
+    if (!AirpcapLoaded) return;
+    g_PAirpcapClose(handle);
 }
 
 /*
@@ -692,8 +692,8 @@ airpcap_if_close(PAirpcapHandle handle)
 BOOL
 airpcap_if_turn_led_on(PAirpcapHandle AdapterHandle, UINT LedNumber)
 {
-	if (!AirpcapLoaded) return FALSE;
-	return g_PAirpcapTurnLedOn(AdapterHandle,LedNumber);
+    if (!AirpcapLoaded) return FALSE;
+    return g_PAirpcapTurnLedOn(AdapterHandle,LedNumber);
 }
 
 /*
@@ -702,8 +702,8 @@ airpcap_if_turn_led_on(PAirpcapHandle AdapterHandle, UINT LedNumber)
 BOOL
 airpcap_if_turn_led_off(PAirpcapHandle AdapterHandle, UINT LedNumber)
 {
-	if (!AirpcapLoaded) return FALSE;
-	return g_PAirpcapTurnLedOff(AdapterHandle,LedNumber);
+    if (!AirpcapLoaded) return FALSE;
+    return g_PAirpcapTurnLedOff(AdapterHandle,LedNumber);
 }
 
 /*
@@ -712,8 +712,8 @@ airpcap_if_turn_led_off(PAirpcapHandle AdapterHandle, UINT LedNumber)
 BOOL
 airpcap_if_get_device_channel(PAirpcapHandle ah, PUINT ch)
 {
-	if (!AirpcapLoaded) return FALSE;
-	return g_PAirpcapGetDeviceChannel(ah,ch);
+    if (!AirpcapLoaded) return FALSE;
+    return g_PAirpcapGetDeviceChannel(ah,ch);
 }
 
 /*
@@ -722,8 +722,8 @@ airpcap_if_get_device_channel(PAirpcapHandle ah, PUINT ch)
 BOOL
 airpcap_if_set_device_channel(PAirpcapHandle ah, UINT ch)
 {
-	if (!AirpcapLoaded) return FALSE;
-	return g_PAirpcapSetDeviceChannel(ah,ch);
+    if (!AirpcapLoaded) return FALSE;
+    return g_PAirpcapSetDeviceChannel(ah,ch);
 }
 
 /*
@@ -732,8 +732,8 @@ airpcap_if_set_device_channel(PAirpcapHandle ah, UINT ch)
 BOOL
 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);
 }
 
 /*
@@ -742,8 +742,8 @@ airpcap_if_get_link_type(PAirpcapHandle ah, PAirpcapLinkType lt)
 BOOL
 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);
 }
 
 /*
@@ -752,8 +752,8 @@ airpcap_if_set_link_type(PAirpcapHandle ah, AirpcapLinkType lt)
 BOOL
 airpcap_if_get_fcs_presence(PAirpcapHandle ah, PBOOL fcs)
 {
-	if (!AirpcapLoaded) return FALSE;
-	return g_PAirpcapGetFcsPresence(ah,fcs);
+    if (!AirpcapLoaded) return FALSE;
+    return g_PAirpcapGetFcsPresence(ah,fcs);
 }
 
 /*
@@ -762,8 +762,8 @@ airpcap_if_get_fcs_presence(PAirpcapHandle ah, PBOOL fcs)
 BOOL
 airpcap_if_set_fcs_presence(PAirpcapHandle ah, BOOL fcs)
 {
-	if (!AirpcapLoaded) return FALSE;
-	return g_PAirpcapSetFcsPresence(ah,fcs);
+    if (!AirpcapLoaded) return FALSE;
+    return g_PAirpcapSetFcsPresence(ah,fcs);
 }
 
 /*
@@ -772,8 +772,8 @@ airpcap_if_set_fcs_presence(PAirpcapHandle ah, BOOL fcs)
 BOOL
 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);
 }
 
 /*
@@ -782,8 +782,8 @@ airpcap_if_get_decryption_state(PAirpcapHandle ah, PAirpcapDecryptionState PEnab
 BOOL
 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);
 }
 
 /*
@@ -792,8 +792,8 @@ airpcap_if_set_decryption_state(PAirpcapHandle ah, AirpcapDecryptionState Enable
 BOOL
 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);
 }
 
 /*
@@ -802,8 +802,8 @@ airpcap_if_get_driver_decryption_state(PAirpcapHandle ah, PAirpcapDecryptionStat
 BOOL
 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);
 }
 
 /*
@@ -812,8 +812,8 @@ airpcap_if_set_driver_decryption_state(PAirpcapHandle ah, AirpcapDecryptionState
 BOOL
 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);
 }
 
 /*
@@ -822,8 +822,8 @@ airpcap_if_get_fcs_validation(PAirpcapHandle ah, PAirpcapValidationType val)
 BOOL
 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);
 }
 
 /*
@@ -832,8 +832,8 @@ airpcap_if_set_fcs_validation(PAirpcapHandle ah, AirpcapValidationType val)
 BOOL
 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);
 }
 
 /*
@@ -842,8 +842,8 @@ airpcap_if_set_device_keys(PAirpcapHandle AdapterHandle, PAirpcapKeysCollection
 BOOL
 airpcap_if_get_device_keys(PAirpcapHandle AdapterHandle, PAirpcapKeysCollection KeysCollection, PUINT PKeysCollectionSize)
 {
-	if (!AirpcapLoaded) return FALSE;
-	return g_PAirpcapGetDeviceKeys(AdapterHandle,KeysCollection,PKeysCollectionSize);
+    if (!AirpcapLoaded) return FALSE;
+    return g_PAirpcapGetDeviceKeys(AdapterHandle,KeysCollection,PKeysCollectionSize);
 }
 
 /*
@@ -852,8 +852,8 @@ airpcap_if_get_device_keys(PAirpcapHandle AdapterHandle, PAirpcapKeysCollection
 BOOL
 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);
 }
 
 /*
@@ -862,8 +862,8 @@ airpcap_if_set_driver_keys(PAirpcapHandle AdapterHandle, PAirpcapKeysCollection
 BOOL
 airpcap_if_get_driver_keys(PAirpcapHandle AdapterHandle, PAirpcapKeysCollection KeysCollection, PUINT PKeysCollectionSize)
 {
-	if (!AirpcapLoaded || (g_PAirpcapGetDriverKeys==NULL)) return FALSE;
-	return g_PAirpcapGetDriverKeys(AdapterHandle,KeysCollection,PKeysCollectionSize);
+    if (!AirpcapLoaded || (g_PAirpcapGetDriverKeys==NULL)) return FALSE;
+    return g_PAirpcapGetDriverKeys(AdapterHandle,KeysCollection,PKeysCollectionSize);
 }
 
 /*
@@ -872,38 +872,40 @@ 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];
+    PAirpcapHandle ad;
+    gchar ebuf[AIRPCAP_ERRBUF_SIZE];
 
-	airpcap_if_info_t *if_info = NULL;
+    airpcap_if_info_t *if_info = NULL;
 
-	/* Probably I have to switch on the leds!!! */
-	ad = airpcap_if_open(name, ebuf);
-	if(ad)
-		{
+    /* 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;
+	    if_info->description = NULL;
 	else
-		if_info->description = g_strdup(description);
+	    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);
-		}
-	return if_info;
+	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);
+	}
+    }
+    return if_info;
 }
 
 /*
@@ -912,49 +914,51 @@ gchar ebuf[AIRPCAP_ERRBUF_SIZE];
 airpcap_if_info_t*
 airpcap_driver_fake_if_info_new()
 {
-	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)
-		{
+    /* 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_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);
-		}
+	airpcap_if_get_driver_decryption_state(ad, &(fake_if_info->DecryptionOn));
+	airpcap_if_get_fcs_validation(ad,&(fake_if_info->CrcValidationOn));
+	airpcap_if_get_fcs_presence(ad,&(fake_if_info->IsFcsPresent));
+	airpcap_if_get_link_type(ad,&(fake_if_info->linkType));
+	airpcap_if_get_device_channel(ad,&(fake_if_info->channel));
+	airpcap_if_turn_led_on(ad, 0);
+	fake_if_info->led = TRUE;
+	fake_if_info->blinking = FALSE;
+	fake_if_info->saved = TRUE; /* NO NEED TO BE SAVED */
+
+	/* get the keys, if everything is ok, close the adapter */
+	if(airpcap_if_load_driver_keys(ad,fake_if_info))
+	{
+	    airpcap_if_close(ad);
+	}
+    }
 
-	return fake_if_info;
+    return fake_if_info;
 }
 
 /*
@@ -964,10 +968,10 @@ void
 airpcap_if_info_print(airpcap_if_info_t* if_info)
 {
     if(if_info == NULL)
-	    {
-	    g_print("\nWARNING : AirPcap Interface pointer is NULL!\n");
-	    return;
-	    }
+    {
+	g_print("\nWARNING : AirPcap Interface pointer is NULL!\n");
+	return;
+    }
 
     g_print("\n----------------- AirPcap Interface \n");
     g_print("              NAME: %s\n",if_info->name);
@@ -999,26 +1003,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;
@@ -1034,26 +1038,26 @@ airpcap_if_load_driver_keys(PAirpcapHandle ad, airpcap_if_info_t *if_info)
     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 +1069,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 +1081,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 +1091,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 +1119,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;
 }
 
 /*
@@ -1133,13 +1137,16 @@ get_airpcap_interface_list(int *err, char **err_str)
     AirpcapDeviceDescription *devsList, *adListEntry;
     char errbuf[PCAP_ERRBUF_SIZE];
 
-    if(!AirpcapLoaded || !g_PAirpcapGetDeviceList(&devsList, errbuf))
+    if (!AirpcapLoaded)
+	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;
     }
 
     /*
@@ -1149,18 +1156,18 @@ 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);
-	    *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;
     }
 
     /*
@@ -1169,10 +1176,10 @@ get_airpcap_interface_list(int *err, char **err_str)
     adListEntry = devsList;
     for(i = 0; i < n_adapts; i++)
     {
-      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);
+	il = g_list_append(il, if_info);
 
-      adListEntry = adListEntry->next;
+	adListEntry = adListEntry->next;
     }
 
     g_PAirpcapFreeDeviceList(devsList);
@@ -1202,10 +1209,12 @@ 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->description,description) == 0)
+		{
+		    return if_info->name;
+		}
+	    }
 	    ifn++;
 	}
     }
@@ -1224,22 +1233,24 @@ airpcap_if_info_t* get_airpcap_if_by_name(GList* if_list, const gchar* name)
 
     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)
 	    {
-	    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++;
-		    }
+		if ( g_ascii_strcasecmp(if_info->name,name) == 0)
+		{
+		    return if_info;
+		}
 	    }
+	    ifn++;
+	}
+    }
     return NULL;
 }
 
@@ -1257,37 +1268,37 @@ airpcap_get_key_string(AirpcapKey key)
     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\0", key.KeyData[j]);
+		/*
+		 * XXX - use g_strconcat() or GStrings instead ???
+		 */
+		l = g_strlcat(dst,src,WEP_KEY_MAX_CHAR_SIZE+1);
 	    }
+	    g_free(src);
+	}
+    }
     else if(key.KeyType == 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;
 }
@@ -1302,8 +1313,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;
@@ -1325,22 +1336,24 @@ gpointer get_airpcap_if_from_description(GList* if_list, const gchar* descriptio
 
     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)
 	    {
-	    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++;
-		    }
+		if ( g_ascii_strcasecmp(if_info->description,description) == 0)
+		{
+		    return if_info;
+		}
 	    }
+	    ifn++;
+	}
+    }
     return NULL;
 }
 
@@ -1350,28 +1363,28 @@ gpointer get_airpcap_if_from_description(GList* if_list, const gchar* descriptio
 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_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);
+    }
 
-	return number;
+    return number;
 }
 
 /*
@@ -1380,18 +1393,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;
 }
 
 /*
@@ -1400,12 +1413,12 @@ airpcap_get_if_string_number_from_description(gchar* description)
 airpcap_if_info_t*
 airpcap_get_default_if(GList* airpcap_if_list)
 {
-int ifn = 0;
-GList* popdown_if_list = NULL;
-GList* curr = NULL;
+    int ifn = 0;
+    GList* popdown_if_list = NULL;
+    GList* curr = NULL;
 
-	gchar* s;
-	airpcap_if_info_t* if_info = NULL;
+    gchar* s;
+    airpcap_if_info_t* if_info = NULL;
 
     if(prefs.capture_device != NULL)
     {
@@ -1413,7 +1426,7 @@ GList* curr = NULL;
 	if_info = get_airpcap_if_by_name(airpcap_if_list,g_strdup(get_if_name(prefs.capture_device)));
 	g_free(s);
     }
-	return if_info;
+    return if_info;
 }
 
 /*
@@ -1426,35 +1439,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);
 
 	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);
-
-		if_info->saved = TRUE;
-		}
+	{
+	    /* 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);
+
+	    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);
 	}
+    }
 }
 
 /*
@@ -1471,38 +1484,38 @@ airpcap_save_selected_if_configuration(airpcap_if_info_t* if_info)
 	ad = airpcap_if_open(get_airpcap_name_from_description(airpcap_if_list, if_info->description), 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;
-			}
-
-		if_info->saved = TRUE;
+	{
+	    /* 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;
+	    }
+
+	    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);
+	}
     }
 }
 
@@ -1520,16 +1533,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;
@@ -1549,8 +1562,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);
@@ -1561,24 +1574,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");
@@ -1607,37 +1620,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 = new_key->key->len *4; /* every char is 4 bits in WEP keys (it is an exadecimal number) */
 
-	/* SSID not used in WEP keys */
-	new_key->ssid = NULL;
+	    /* SSID not used in WEP keys */
+	    new_key->ssid = NULL;
 
-	/* TYPE (WEP in this case) */
-	new_key->type = info_if->keysCollection->Keys[i].KeyType;
+	    /* TYPE (WEP in this case) */
+	    new_key->type = info_if->keysCollection->Keys[i].KeyType;
 
-	/* Append the new element in the list */
-	key_list = g_list_append(key_list,(gpointer)new_key);
+	    /* 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 */
 	}
     }
 
@@ -1669,7 +1682,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)
@@ -1679,37 +1692,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 = new_key->key->len *4; /* every char is 4 bits in WEP keys (it is an exadecimal number) */
 
-	/* SSID not used in WEP keys */
-	new_key->ssid = NULL;
+	    /* SSID not used in WEP keys */
+	    new_key->ssid = NULL;
 
-	/* TYPE (WEP in this case) */
-	new_key->type = 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 */
 	}
     }
 
@@ -1772,8 +1785,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;
 
@@ -1817,7 +1830,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
@@ -1859,7 +1872,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);
 	    }
 	}
     }
@@ -1925,9 +1938,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;
@@ -1988,23 +2001,23 @@ key_lists_are_equal(GList* list1, GList* list2)
      * is not 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
@@ -2032,8 +2045,8 @@ 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;
@@ -2050,14 +2063,14 @@ test_if_on(pref_t *pref, gpointer ud _U_)
 
 
     if (g_strncasecmp(pref->name, "enable_decryption", 17) == 0 && pref->type == PREF_BOOL)
-	{
+    {
 	number = *pref->varp.boolp;
 
 	if(number) *is_on = TRUE;
 	else *is_on = FALSE;
 
 	return 1;
-	}
+    }
     return 0;
 }
 
@@ -2091,12 +2104,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);
 
@@ -2112,28 +2125,28 @@ 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;
+	}
     }
 }
 
@@ -2147,7 +2160,7 @@ set_on_off(pref_t *pref, gpointer ud _U_)
     is_on = (gboolean*)ud;
 
     if (g_strncasecmp(pref->name, "enable_decryption", 17) == 0 && pref->type == PREF_BOOL)
-	{
+    {
 	number = *pref->varp.boolp;
 
 	g_free((void *)*pref->varp.boolp);
@@ -2157,7 +2170,7 @@ set_on_off(pref_t *pref, gpointer ud _U_)
 	    *pref->varp.boolp = FALSE;
 
 	return 1;
-	}
+    }
     return 0;
 }
 
@@ -2192,36 +2205,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);
 
@@ -2230,25 +2243,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(get_airpcap_name_from_description(airpcap_if_list,curr_if->description), ebuf);
-			if(ad)
-		    {
+		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;
 }
@@ -2261,70 +2274,70 @@ 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;
-  }
- }
+    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;
+	}
+    }
 }
 
 /*
@@ -2333,7 +2346,7 @@ BOOL new_functions = TRUE;
 void
 get_compiled_airpcap_version(GString *str)
 {
-	g_string_append(str, "with AirPcap");
+    g_string_append(str, "with AirPcap");
 }
 
 /*
@@ -2342,17 +2355,17 @@ 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_sprintfa(str, "with AirPcap %d.%d.%d build %d", vmaj, vmin,
+	vrev, build);
 }
 
 #endif /* _WIN32 */