From f22b7d299337c7c77b44de40f2329ca45d1e19c3 Mon Sep 17 00:00:00 2001 From: Bill Meier Date: Sun, 25 Nov 2012 21:47:04 +0000 Subject: [PATCH] Fix a [-Wshadow] warning; Also: Do some minor whitespace and formatting changes. svn path=/trunk/; revision=46187 --- airpcap_loader.c | 1526 +++++++++++++++++++++++----------------------- 1 file changed, 763 insertions(+), 763 deletions(-) diff --git a/airpcap_loader.c b/airpcap_loader.c index d2bb93b0db..76566f6c51 100644 --- a/airpcap_loader.c +++ b/airpcap_loader.c @@ -123,20 +123,20 @@ 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}}, + {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; @@ -160,31 +160,31 @@ get_wep_key(pref_t *pref, gpointer ud) { /* strip out key type */ if (g_ascii_strncasecmp(*pref->varp.string, STRING_KEY_TYPE_WEP ":", 4) == 0) { - key_string = (gchar*)(*pref->varp.string)+4; + 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; + 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; + 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; + 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(key_string, key_type); + /* Here we have the string describing the key... */ + 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; } @@ -196,28 +196,28 @@ wep_key_is_valid(char* key) GString *new_key_string; guint i=0; - if(key == NULL) - return FALSE; + if (key == NULL) + return FALSE; new_key_string = g_string_new(key); - if( ((new_key_string->len) > WEP_KEY_MAX_CHAR_SIZE) || ((new_key_string->len) < 2)) + 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) + if ((new_key_string->len % 2) != 0) { - g_string_free(new_key_string,FALSE); - return FALSE; + 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; - } + 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); @@ -228,9 +228,9 @@ wep_key_is_valid(char* key) static guint set_wep_key(pref_t *pref, gpointer ud _U_) { - gchar *my_string = NULL; - keys_cb_data_t* user_data; - gint wep_key_number = 0; + gchar *my_string = NULL; + keys_cb_data_t* user_data; + gint wep_key_number = 0; decryption_key_t* new_key; @@ -239,37 +239,37 @@ set_wep_key(pref_t *pref, gpointer ud _U_) 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); + /* 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); + 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); - /* 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 */ - 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++; + /* 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++; } return 0; @@ -315,7 +315,7 @@ load_wlan_driver_wep_keys(void) /* free the WEP key string */ for(i=0;ilist);i++) { - g_free(g_list_nth(user_data->list,i)->data); + g_free(g_list_nth(user_data->list,i)->data); } /* free the (empty) list */ @@ -356,9 +356,9 @@ write_wlan_wep_keys_to_registry(airpcap_if_info_t* info_if, GList* key_list) * Allocate the collection */ KeysCollection = (PAirpcapKeysCollection)g_malloc(KeysCollectionSize); - if(!KeysCollection) + if (!KeysCollection) { - return FALSE; + return FALSE; } /* @@ -368,32 +368,32 @@ write_wlan_wep_keys_to_registry(airpcap_if_info_t* info_if, GList* key_list) for(i = 0; i < keys_in_list; i++) { - KeysCollection->Keys[i].KeyType = AIRPDCAP_KEY_TYPE_WEP; + 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 = (guint) new_key->len / 2; - memset(&KeysCollection->Keys[i].KeyData, 0, sizeof(KeysCollection->Keys[i].KeyData)); + KeysCollection->Keys[i].KeyLen = (guint) new_key->len / 2; + memset(&KeysCollection->Keys[i].KeyData, 0, sizeof(KeysCollection->Keys[i].KeyData)); - for(j = 0 ; j < new_key->len; j += 2) - { - s[0] = new_key->str[j]; - s[1] = new_key->str[j+1]; - s[2] = '\0'; - KeyByte = (guint8)strtol(s, NULL, 16); - KeysCollection->Keys[i].KeyData[j / 2] = KeyByte; - } + for(j = 0 ; j < new_key->len; j += 2) + { + s[0] = new_key->str[j]; + s[1] = new_key->str[j+1]; + s[2] = '\0'; + KeyByte = (guint8)strtol(s, NULL, 16); + KeysCollection->Keys[i].KeyData[j / 2] = KeyByte; + } - g_string_free(new_key,TRUE); + g_string_free(new_key,TRUE); } /* * Free the old adapter key collection! */ - if(info_if->keysCollection != NULL) - g_free(info_if->keysCollection); + if (info_if->keysCollection != NULL) + g_free(info_if->keysCollection); /* * Set this collection ad the new one @@ -421,21 +421,21 @@ write_wlan_wep_keys_to_registry(airpcap_if_info_t* info_if, GList* key_list) gboolean write_wlan_driver_wep_keys_to_registry(GList* key_list) { - guint i,j,k,n,y; - GString *new_key; - gchar s[3]; - PAirpcapKeysCollection KeysCollection; - guint KeysCollectionSize; - guint8 KeyByte; - guint keys_in_list = 0; - decryption_key_t* key_item = NULL; - airpcap_if_info_t* fake_info_if = NULL; + guint i,j,k,n,y; + GString *new_key; + gchar s[3]; + PAirpcapKeysCollection KeysCollection; + guint KeysCollectionSize; + guint8 KeyByte; + guint keys_in_list = 0; + decryption_key_t* key_item = NULL; + airpcap_if_info_t* fake_info_if = NULL; /* Create the fake_info_if from the first adapter of the list */ fake_info_if = airpcap_driver_fake_if_info_new(); - if(fake_info_if == NULL) - return FALSE; + if (fake_info_if == NULL) + return FALSE; /* * XXX - When WPA will be supported, change this to: keys_in_list = g_list_length(key_list); @@ -443,8 +443,8 @@ write_wlan_driver_wep_keys_to_registry(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++; /* * Calculate the size of the keys collection @@ -455,9 +455,9 @@ write_wlan_driver_wep_keys_to_registry(GList* key_list) * Allocate the collection */ KeysCollection = (PAirpcapKeysCollection)g_malloc(KeysCollectionSize); - if(!KeysCollection) + if (!KeysCollection) { - return FALSE; + return FALSE; } /* @@ -475,51 +475,51 @@ write_wlan_driver_wep_keys_to_registry(GList* key_list) for(i = 0; i < n; i++) { - /* Retrieve the Item corresponding to the i-th key */ - key_item = (decryption_key_t*)g_list_nth_data(key_list,i); + /* Retrieve the Item corresponding to the i-th key */ + key_item = (decryption_key_t*)g_list_nth_data(key_list,i); - /* - * 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) - */ - if(key_item->type == AIRPDCAP_KEY_TYPE_WEP) - { - KeysCollection->Keys[y].KeyType = AIRPDCAP_KEY_TYPE_WEP; + /* + * 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) + */ + if (key_item->type == AIRPDCAP_KEY_TYPE_WEP) + { + KeysCollection->Keys[y].KeyType = AIRPDCAP_KEY_TYPE_WEP; - new_key = g_string_new(key_item->key->str); + new_key = g_string_new(key_item->key->str); - KeysCollection->Keys[y].KeyLen = (guint) new_key->len / 2; - memset(&KeysCollection->Keys[y].KeyData, 0, sizeof(KeysCollection->Keys[y].KeyData)); + 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) - { - s[0] = new_key->str[j]; - s[1] = new_key->str[j+1]; - s[2] = '\0'; - KeyByte = (guint8)strtol(s, NULL, 16); - KeysCollection->Keys[y].KeyData[j / 2] = KeyByte; - } - /* XXX - Change when WPA will be supported!!! */ - y++; - g_string_free(new_key,TRUE); - } - else if(key_item->type == AIRPDCAP_KEY_TYPE_WPA_PWD) - { - /* 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... */ - } + for(j = 0 ; j < new_key->len; j += 2) + { + s[0] = new_key->str[j]; + s[1] = new_key->str[j+1]; + s[2] = '\0'; + KeyByte = (guint8)strtol(s, NULL, 16); + KeysCollection->Keys[y].KeyData[j / 2] = KeyByte; + } + /* XXX - Change when WPA will be supported!!! */ + y++; + g_string_free(new_key,TRUE); + } + else if (key_item->type == AIRPDCAP_KEY_TYPE_WPA_PWD) + { + /* 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... */ + } } /* * Free the old adapter key collection! */ - if(fake_info_if->keysCollection != NULL) - g_free(fake_info_if->keysCollection); + if (fake_info_if->keysCollection != NULL) + g_free(fake_info_if->keysCollection); /* * Set this collection ad the new one @@ -548,17 +548,17 @@ write_wlan_driver_wep_keys_to_registry(GList* key_list) int save_wlan_driver_wep_keys(void) { - GList* key_list = NULL; - char* tmp_key = NULL; - guint keys_in_list,i; - keys_cb_data_t* user_data; + GList* key_list = NULL; + char* tmp_key = NULL; + guint keys_in_list,i; + keys_cb_data_t* user_data; airpcap_if_info_t* fake_info_if = NULL; /* Create the fake_info_if from the first adapter of the list */ fake_info_if = airpcap_driver_fake_if_info_new(); - if(fake_info_if == NULL) - return 0; + if (fake_info_if == NULL) + return 0; /* Retrieve the wlan preferences */ wlan_prefs = prefs_find_module("wlan"); @@ -567,20 +567,20 @@ save_wlan_driver_wep_keys(void) user_data = (keys_cb_data_t*)g_malloc(sizeof(keys_cb_data_t)); /* Number of keys in key list */ - if(fake_info_if->keysCollectionSize != 0) - keys_in_list = (guint)(fake_info_if->keysCollectionSize - sizeof(AirpcapKeysCollection))/sizeof(AirpcapKey); + if (fake_info_if->keysCollectionSize != 0) + keys_in_list = (guint)(fake_info_if->keysCollectionSize - sizeof(AirpcapKeysCollection))/sizeof(AirpcapKey); else - keys_in_list = 0; + keys_in_list = 0; for(i=0; ikeysCollection->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); - } + 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); + } } /* Now we know the exact number of WEP keys in the list, so store it ... */ @@ -608,7 +608,7 @@ save_wlan_driver_wep_keys(void) /* free the WEP key string */ for(i=0;ilist);i++) { - g_free(g_list_nth(user_data->list,i)->data); + g_free(g_list_nth(user_data->list,i)->data); } /* free the (empty) list */ @@ -665,9 +665,9 @@ save_wlan_wireshark_wep_keys(GList* key_ls) /* free the WEP key string */ for(i=0;ilist);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 */ @@ -726,7 +726,7 @@ airpcap_if_close(PAirpcapHandle handle) int airpcap_get_dll_state(void) { - return AirpcapVersion; + return AirpcapVersion; } /* @@ -766,13 +766,13 @@ 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; + 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 TRUE; + } else if (airpcap_get_dll_state() == AIRPCAP_DLL_OK) { + return g_PAirpcapGetDeviceSupportedChannels(ah, cInfo, nInfo); } return FALSE; } @@ -907,16 +907,16 @@ airpcap_if_set_device_channel_ex(PAirpcapHandle ah, AirpcapChannelInfo ChannelIn { if (!AirpcapLoaded) return FALSE; if (airpcap_get_dll_state() == AIRPCAP_DLL_OLD){ - gint channel = 0; - channel = ieee80211_mhz_to_chan(ChannelInfo.Frequency); + gint channel = 0; + channel = ieee80211_mhz_to_chan(ChannelInfo.Frequency); - if (channel < 0){ - return FALSE; - } else { - return airpcap_if_set_device_channel(ah, channel); - } + 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 g_PAirpcapSetDeviceChannelEx (ah, ChannelInfo); } return FALSE; @@ -937,18 +937,18 @@ airpcap_if_get_device_channel_ex(PAirpcapHandle ah, PAirpcapChannelInfo pChannel pChannelInfo->Reserved[2] = 0; if (airpcap_get_dll_state() == AIRPCAP_DLL_OLD){ - guint channel = 0; - guint chan_freq = 0; + guint channel = 0; + guint chan_freq = 0; - if (!airpcap_if_get_device_channel(ah, &channel)) return FALSE; + 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; + chan_freq = ieee80211_chan_to_mhz(channel, TRUE); + if (chan_freq == 0) return FALSE; + pChannelInfo->Frequency = chan_freq; - return TRUE; + return TRUE; } else if (airpcap_get_dll_state() == AIRPCAP_DLL_OK){ - return g_PAirpcapGetDeviceChannelEx (ah, pChannelInfo); + return g_PAirpcapGetDeviceChannelEx (ah, pChannelInfo); } return FALSE; } @@ -1106,34 +1106,34 @@ airpcap_if_info_new(char *name, char *description) /* Probably I have to switch on the leds!!! */ ad = airpcap_if_open(name, ebuf); - if(ad) + if (ad) { - if_info = g_malloc0(sizeof (airpcap_if_info_t)); - if_info->name = g_strdup(name); - if (description == NULL){ - if_info->description = NULL; - }else{ - if_info->description = g_strdup(description); - } + if_info = 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 */ + 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); - } + /* 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; } @@ -1151,41 +1151,41 @@ airpcap_driver_fake_if_info_new(void) airpcap_if_info_t *fake_if_info = NULL; /* Maybe for some reason no airpcap adapter is found */ - if(airpcap_if_list == NULL) - return NULL; + 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; + if (if_info == NULL) + return NULL; /* Open the 'fake' adapter */ ad = airpcap_if_open(if_info->name, ebuf); - if(ad) + 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_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 */ + 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); - } + /* 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; @@ -1198,10 +1198,10 @@ void airpcap_if_info_print(airpcap_if_info_t* if_info) { guint i; - if(if_info == NULL) + 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"); @@ -1224,10 +1224,10 @@ airpcap_if_info_print(airpcap_if_info_t* if_info) 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 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"); } @@ -1238,31 +1238,31 @@ airpcap_if_info_print(airpcap_if_info_t* if_info) gboolean airpcap_if_load_keys(PAirpcapHandle ad, airpcap_if_info_t *if_info) { - if(!if_info) return FALSE; + if (!if_info) return FALSE; if_info->keysCollectionSize = 0; if_info->keysCollection = NULL; - if(!airpcap_if_get_device_keys(ad, NULL, &(if_info->keysCollectionSize))) + if (!airpcap_if_get_device_keys(ad, NULL, &(if_info->keysCollectionSize))) { - if(if_info->keysCollectionSize == 0) - { - if_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); @@ -1278,26 +1278,26 @@ airpcap_if_load_driver_keys(PAirpcapHandle ad, airpcap_if_info_t *if_info) if_info->keysCollectionSize = 0; if_info->keysCollection = NULL; - if(!airpcap_if_get_driver_keys(ad, NULL, &(if_info->keysCollectionSize))) + if (!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); @@ -1310,10 +1310,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); } /* @@ -1322,8 +1322,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); } /* @@ -1335,23 +1335,23 @@ free_airpcap_if_cb(gpointer data, gpointer user_data _U_) airpcap_if_info_t *if_info = data; if (NULL == if_info) - return; + return; 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); /* XXX - FREE THE WEP KEY LIST HERE!!!*/ - if(if_info->keysCollection != NULL) + 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 (if_info->ip_addr != NULL) + g_slist_free(if_info->ip_addr); g_free(if_info); } @@ -1384,17 +1384,17 @@ get_airpcap_interface_list(int *err, char **err_str) 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; } /* @@ -1404,18 +1404,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) + 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; } /* @@ -1424,12 +1424,12 @@ get_airpcap_interface_list(int *err, char **err_str) adListEntry = devsList; while(adListEntry) { - if_info = airpcap_if_info_new(adListEntry->Name, adListEntry->Description); - if (if_info != NULL){ - 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); @@ -1443,16 +1443,16 @@ get_airpcap_interface_list(int *err, char **err_str) */ airpcap_if_info_t* get_airpcap_if_from_name(GList* if_list, const gchar* name) { - GList* curr; - airpcap_if_info_t* if_info; + GList* curr; + airpcap_if_info_t* 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); - } - } - return (NULL); + 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); + } + } + return (NULL); } /* @@ -1467,37 +1467,37 @@ airpcap_get_key_string(AirpcapKey key) dst = NULL; src = NULL; - if(key.KeyType == AIRPDCAP_KEY_TYPE_WEP) + if (key.KeyType == AIRPDCAP_KEY_TYPE_WEP) { - if(key.KeyLen != 0) - { - /* Allocate the string used to store the ASCII representation of the WEP key */ - dst = (gchar*)g_malloc(sizeof(gchar)*WEP_KEY_MAX_CHAR_SIZE + 1); - /* Make sure that the first char is '\0' in order to make g_strlcat() work */ - dst[0]='\0'; + 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", key.KeyData[j]); - /* - * XXX - use g_strconcat() or GStrings instead ??? - */ - g_strlcat(dst, src, WEP_KEY_MAX_CHAR_SIZE+1); - } - g_free(src); - } + for(j = 0; j < key.KeyLen; j++) + { + src = g_strdup_printf("%.2x", key.KeyData[j]); + /* + * XXX - use g_strconcat() or GStrings instead ??? + */ + g_strlcat(dst, src, WEP_KEY_MAX_CHAR_SIZE+1); + } + g_free(src); + } } - else if(key.KeyType == AIRPDCAP_KEY_TYPE_WPA_PWD) + else if (key.KeyType == AIRPDCAP_KEY_TYPE_WPA_PWD) { - /* XXX - Add code here */ + /* XXX - Add code here */ } - else if(key.KeyType == AIRPDCAP_KEY_TYPE_WPA_PMK) + else if (key.KeyType == AIRPDCAP_KEY_TYPE_WPA_PMK) { - /* XXX - Add code here */ + /* XXX - Add code here */ } else { - /* XXX - Add code here */ + /* XXX - Add code here */ } return dst; @@ -1509,18 +1509,18 @@ airpcap_get_key_string(AirpcapKey key) void airpcap_if_clear_decryption_settings(airpcap_if_info_t* info_if) { - if(info_if != NULL) + if (info_if != NULL) { - if(info_if->keysCollection != NULL) - { - g_free(info_if->keysCollection); - info_if->keysCollection = NULL; - } + if (info_if->keysCollection != NULL) + { + g_free(info_if->keysCollection); + info_if->keysCollection = NULL; + } - info_if->keysCollectionSize = 0; + info_if->keysCollectionSize = 0; - info_if->DecryptionOn = FALSE; - info_if->saved = FALSE; + info_if->DecryptionOn = FALSE; + info_if->saved = FALSE; } } @@ -1539,16 +1539,16 @@ airpcap_get_if_string_number(airpcap_if_info_t* if_info) /* 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 (a == 0) { - if(g_ascii_strcasecmp(if_info->name,AIRPCAP_DEVICE_ANY_EXTRACT_STRING)!=0) - number = g_strdup_printf("??"); - else - number = g_strdup_printf(AIRPCAP_CHANNEL_ANY_NAME); + if (g_ascii_strcasecmp(if_info->name,AIRPCAP_DEVICE_ANY_EXTRACT_STRING)!=0) + number = g_strdup_printf("??"); + else + number = g_strdup_printf(AIRPCAP_CHANNEL_ANY_NAME); } else { - number = g_strdup_printf("%.2u",n); + number = g_strdup_printf("%.2u",n); } return number; @@ -1578,13 +1578,13 @@ airpcap_get_if_string_number_from_description(gchar* description) * Returns the default airpcap interface of a list, NULL if list is empty */ airpcap_if_info_t* -airpcap_get_default_if(GList* airpcap_if_list) +airpcap_get_default_if(GList* airpcap_if_list_p) { airpcap_if_info_t* if_info = NULL; if ((prefs.capture_device != NULL) && (*prefs.capture_device != '\0')) { - if_info = get_airpcap_if_from_name(airpcap_if_list, + if_info = get_airpcap_if_from_name(airpcap_if_list_p, get_if_name(prefs.capture_device)); } return if_info; @@ -1599,35 +1599,35 @@ airpcap_load_selected_if_configuration(airpcap_if_info_t* if_info) gchar ebuf[AIRPCAP_ERRBUF_SIZE]; PAirpcapHandle ad; - if(if_info != NULL) + if (if_info != NULL) { - ad = airpcap_if_open(if_info->name, ebuf); + ad = airpcap_if_open(if_info->name, ebuf); - if(ad) - { - /* Stop blinking (if it was blinking!)*/ - if(if_info->blinking) - { - /* Turn on the light (if it was off) */ - if(!(if_info->led)) airpcap_if_turn_led_on(ad, 0); - } + if (ad) + { + /* Stop blinking (if it was blinking!)*/ + if (if_info->blinking) + { + /* Turn on the light (if it was off) */ + if (!(if_info->led)) airpcap_if_turn_led_on(ad, 0); + } - /* Apply settings... */ - airpcap_if_get_device_channel_ex(ad,&(if_info->channelInfo)); - airpcap_if_get_fcs_validation(ad,&(if_info->CrcValidationOn)); - airpcap_if_get_fcs_presence(ad,&(if_info->IsFcsPresent)); - airpcap_if_get_link_type(ad,&(if_info->linkType)); - airpcap_if_get_decryption_state(ad, &(if_info->DecryptionOn)); - /* get the keys, if everything is ok, close the adapter */ - if(airpcap_if_load_keys(ad,if_info)) - airpcap_if_close(ad); + /* Apply settings... */ + airpcap_if_get_device_channel_ex(ad,&(if_info->channelInfo)); + airpcap_if_get_fcs_validation(ad,&(if_info->CrcValidationOn)); + airpcap_if_get_fcs_presence(ad,&(if_info->IsFcsPresent)); + airpcap_if_get_link_type(ad,&(if_info->linkType)); + airpcap_if_get_decryption_state(ad, &(if_info->DecryptionOn)); + /* get the keys, if everything is ok, close the adapter */ + if (airpcap_if_load_keys(ad,if_info)) + airpcap_if_close(ad); - if_info->saved = TRUE; - } - else - { - simple_dialog(ESD_TYPE_ERROR, ESD_BTN_OK, " Error in opening adapter for %s",if_info->description); - } + if_info->saved = TRUE; + } + else + { + simple_dialog(ESD_TYPE_ERROR, ESD_BTN_OK, " Error in opening adapter for %s",if_info->description); + } } } @@ -1640,43 +1640,43 @@ airpcap_save_selected_if_configuration(airpcap_if_info_t* if_info) gchar ebuf[AIRPCAP_ERRBUF_SIZE]; PAirpcapHandle ad; - if(if_info != NULL) + if (if_info != NULL) { - ad = airpcap_if_open(if_info->name, ebuf); + ad = airpcap_if_open(if_info->name, ebuf); - if(ad) - { - /* Stop blinking (if it was blinking!)*/ - if(if_info->blinking) - { - /* Turn on the light (if it was off) */ - if(!(if_info->led)) airpcap_if_turn_led_on(ad, 0); - } + if (ad) + { + /* Stop blinking (if it was blinking!)*/ + if (if_info->blinking) + { + /* Turn on the light (if it was off) */ + if (!(if_info->led)) airpcap_if_turn_led_on(ad, 0); + } - /* Apply settings... */ - airpcap_if_set_device_channel_ex(ad,if_info->channelInfo); - airpcap_if_set_fcs_validation(ad,if_info->CrcValidationOn); - airpcap_if_set_fcs_presence(ad,if_info->IsFcsPresent); - airpcap_if_set_link_type(ad,if_info->linkType); - airpcap_if_set_decryption_state(ad, if_info->DecryptionOn); - airpcap_if_save_keys(ad,if_info); + /* Apply settings... */ + airpcap_if_set_device_channel_ex(ad,if_info->channelInfo); + airpcap_if_set_fcs_validation(ad,if_info->CrcValidationOn); + airpcap_if_set_fcs_presence(ad,if_info->IsFcsPresent); + airpcap_if_set_link_type(ad,if_info->linkType); + airpcap_if_set_decryption_state(ad, if_info->DecryptionOn); + airpcap_if_save_keys(ad,if_info); - /* ... and save them */ - if(!airpcap_if_store_cur_config_as_adapter_default(ad)) - { - simple_dialog(ESD_TYPE_ERROR, ESD_BTN_OK, "Cannot save Wireless configuration!!!\nRemember that in order to store the configuration in the registry you have to:\n\n- Close all the airpcap-based applications.\n- Be sure to have administrative privileges."); - if_info->saved = FALSE; - airpcap_if_close(ad); - return; - } + /* ... 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); - } + 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); + } } } @@ -1689,21 +1689,21 @@ airpcap_save_driver_if_configuration(airpcap_if_info_t* fake_if_info) gchar ebuf[AIRPCAP_ERRBUF_SIZE]; PAirpcapHandle ad; - if(fake_if_info != NULL) + if (fake_if_info != NULL) { - ad = airpcap_if_open(fake_if_info->name, ebuf); + ad = airpcap_if_open(fake_if_info->name, ebuf); - if(ad) - { - /* Apply decryption settings... */ - airpcap_if_set_driver_decryption_state(ad, fake_if_info->DecryptionOn); - airpcap_if_save_driver_keys(ad,fake_if_info); - airpcap_if_close(ad); - } - else - { - simple_dialog(ESD_TYPE_ERROR, ESD_BTN_OK, " Error in opening adapter for %s",fake_if_info->description); - } + if (ad) + { + /* Apply decryption settings... */ + airpcap_if_set_driver_decryption_state(ad, fake_if_info->DecryptionOn); + airpcap_if_save_driver_keys(ad,fake_if_info); + airpcap_if_close(ad); + } + else + { + simple_dialog(ESD_TYPE_ERROR, ESD_BTN_OK, " Error in opening adapter for %s",fake_if_info->description); + } } return; @@ -1721,10 +1721,10 @@ print_key_list(GList* key_list) gint n,i; decryption_key_t* tmp; - if(key_list == NULL) + 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); @@ -1735,24 +1735,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("[%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); + 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","???"); + 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"); @@ -1762,7 +1762,7 @@ print_key_list(GList* key_list) * Retrieves a GList of decryption_key_t structures containing infos about the * keys for the given adapter... returns NULL if no keys are found. */ -GList* +GList * get_airpcap_device_keys(airpcap_if_info_t* info_if) { /* tmp vars */ @@ -1774,45 +1774,45 @@ get_airpcap_device_keys(airpcap_if_info_t* info_if) GList *key_list = NULL; /* Number of keys in key list */ - if(info_if->keysCollectionSize != 0) - keys_in_list = (guint)(info_if->keysCollectionSize - sizeof(AirpcapKeysCollection))/sizeof(AirpcapKey); + if (info_if->keysCollectionSize != 0) + keys_in_list = (guint)(info_if->keysCollectionSize - sizeof(AirpcapKeysCollection))/sizeof(AirpcapKey); else - keys_in_list = 0; + keys_in_list = 0; for(i=0; ikeysCollection->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)); + /* 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)); - /* 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 = (guint) new_key->key->len *4; /* every char is 4 bits in WEP keys (it is an hexadecimal number) */ + /* BITS */ + new_key->bits = (guint) new_key->key->len *4; /* every char is 4 bits in WEP keys (it is an hexadecimal number) */ - /* SSID not used in WEP keys */ - new_key->ssid = NULL; + /* SSID not used in WEP keys */ + new_key->ssid = NULL; - /* TYPE (WEP in this case) */ - new_key->type = info_if->keysCollection->Keys[i].KeyType; + /* TYPE (WEP in this case) */ + new_key->type = info_if->keysCollection->Keys[i].KeyType; - /* Append the new element in the list */ - key_list = g_list_append(key_list,(gpointer)new_key); - } - else if(info_if->keysCollection->Keys[i].KeyType == AIRPDCAP_KEY_TYPE_WPA_PWD) - { - /* XXX - Not supported yet */ - } - else if(info_if->keysCollection->Keys[i].KeyType == AIRPDCAP_KEY_TYPE_WPA_PMK) - { - /* XXX - Not supported yet */ - } + /* Append the new element in the list */ + key_list = g_list_append(key_list,(gpointer)new_key); + } + else if (info_if->keysCollection->Keys[i].KeyType == AIRPDCAP_KEY_TYPE_WPA_PWD) + { + /* XXX - Not supported yet */ + } + else if (info_if->keysCollection->Keys[i].KeyType == AIRPDCAP_KEY_TYPE_WPA_PMK) + { + /* XXX - Not supported yet */ + } } return key_list; @@ -1822,12 +1822,12 @@ get_airpcap_device_keys(airpcap_if_info_t* info_if) * Retrieves a GList of decryption_key_t structures containing infos about the * keys for the global AirPcap driver... returns NULL if no keys are found. */ -GList* +GList * get_airpcap_driver_keys(void) { /* tmp vars */ - char* tmp_key = NULL; - guint i,keys_in_list = 0; + char *tmp_key = NULL; + guint i,keys_in_list = 0; /* real vars*/ decryption_key_t *new_key = NULL; @@ -1842,49 +1842,49 @@ get_airpcap_driver_keys(void) /* Create the fake_info_if from the first adapter of the list */ fake_info_if = airpcap_driver_fake_if_info_new(); - if(fake_info_if == NULL) - return NULL; + if (fake_info_if == NULL) + return NULL; /* Number of keys in key list */ - if(fake_info_if->keysCollectionSize != 0) - keys_in_list = (guint)(fake_info_if->keysCollectionSize - sizeof(AirpcapKeysCollection))/sizeof(AirpcapKey); + if (fake_info_if->keysCollectionSize != 0) + keys_in_list = (guint)(fake_info_if->keysCollectionSize - sizeof(AirpcapKeysCollection))/sizeof(AirpcapKey); else - keys_in_list = 0; + keys_in_list = 0; for(i=0; ikeysCollection->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)); + /* 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)); - /* 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 = (guint) new_key->key->len *4; /* every char is 4 bits in WEP keys (it is an hexadecimal number) */ + /* BITS */ + new_key->bits = (guint) new_key->key->len *4; /* every char is 4 bits in WEP keys (it is an hexadecimal number) */ - /* SSID not used in WEP keys */ - new_key->ssid = NULL; + /* SSID not used in WEP keys */ + new_key->ssid = NULL; - /* TYPE (WEP in this case) */ - new_key->type = fake_info_if->keysCollection->Keys[i].KeyType; + /* TYPE (WEP in this case) */ + new_key->type = fake_info_if->keysCollection->Keys[i].KeyType; - /* Append the new element in the list */ - key_list = g_list_append(key_list,(gpointer)new_key); - } - else if(fake_info_if->keysCollection->Keys[i].KeyType == AIRPDCAP_KEY_TYPE_WPA_PWD) - { - /* XXX - Not supported yet */ - } - else if(fake_info_if->keysCollection->Keys[i].KeyType == AIRPDCAP_KEY_TYPE_WPA_PMK) - { - /* XXX - Not supported yet */ - } + /* 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) + { + /* XXX - Not supported yet */ + } + else if (fake_info_if->keysCollection->Keys[i].KeyType == AIRPDCAP_KEY_TYPE_WPA_PMK) + { + /* XXX - Not supported yet */ + } } airpcap_if_info_free(fake_info_if); @@ -1896,13 +1896,13 @@ get_airpcap_driver_keys(void) * Returns the list of the decryption keys specified for wireshark, NULL if * no key is found */ -GList* +GList * get_wireshark_keys(void) { - keys_cb_data_t* wep_user_data = NULL; + keys_cb_data_t *wep_user_data = NULL; - GList* final_list = NULL; - GList* wep_final_list = NULL; + GList *final_list = NULL; + GList *wep_final_list = NULL; /* Retrieve the wlan preferences */ wlan_prefs = prefs_find_module("wlan"); @@ -1938,100 +1938,100 @@ get_wireshark_keys(void) * If the total number of keys exceeeds the maximum number allowed, * exceeding keys will be discarded... */ -GList* +GList * merge_key_list(GList* list1, GList* list2) { guint n1=0,n2=0; guint i; decryption_key_t *dk1=NULL, - *dk2=NULL, - *new_dk=NULL; + *dk2=NULL, + *new_dk=NULL; GList* merged_list = NULL; - if( (list1 == NULL) && (list2 == NULL) ) - return NULL; + if ( (list1 == NULL) && (list2 == NULL) ) + return NULL; - if(list1 == NULL) + if (list1 == NULL) { - n2 = g_list_length(list2); + n2 = g_list_length(list2); - for(i=0;ibits = dk2->bits; - new_dk->type = dk2->type; - new_dk->key = g_string_new(dk2->key->str); - new_dk->ssid = byte_array_dup(dk2->ssid); + new_dk->bits = dk2->bits; + new_dk->type = dk2->type; + new_dk->key = g_string_new(dk2->key->str); + new_dk->ssid = byte_array_dup(dk2->ssid); - /* Check the total length of the merged list */ - if(g_list_length(merged_list) < MAX_ENCRYPTION_KEYS) - merged_list = g_list_append(merged_list,(gpointer)new_dk); - } + /* Check the total length of the merged list */ + if (g_list_length(merged_list) < MAX_ENCRYPTION_KEYS) + merged_list = g_list_append(merged_list,(gpointer)new_dk); + } } - else if(list2 == NULL) + else if (list2 == NULL) { - n1 = g_list_length(list1); + n1 = g_list_length(list1); - for(i=0;ibits = dk1->bits; - new_dk->type = dk1->type; - new_dk->key = g_string_new(dk1->key->str); - new_dk->ssid = byte_array_dup(dk1->ssid); + new_dk->bits = dk1->bits; + new_dk->type = dk1->type; + new_dk->key = g_string_new(dk1->key->str); + new_dk->ssid = byte_array_dup(dk1->ssid); - /* Check the total length of the merged list */ - if(g_list_length(merged_list) < MAX_ENCRYPTION_KEYS) - merged_list = g_list_append(merged_list,(gpointer)new_dk); - } + /* Check the total length of the merged list */ + if (g_list_length(merged_list) < MAX_ENCRYPTION_KEYS) + merged_list = g_list_append(merged_list,(gpointer)new_dk); + } } else { - n1 = g_list_length(list1); - n2 = g_list_length(list2); + n1 = g_list_length(list1); + n2 = g_list_length(list2); - /* Copy the whole list1 into merged_list */ - for(i=0;ibits = dk1->bits; - new_dk->type = dk1->type; - new_dk->key = g_string_new(dk1->key->str); - new_dk->ssid = byte_array_dup(dk1->ssid); + new_dk->bits = dk1->bits; + new_dk->type = dk1->type; + new_dk->key = g_string_new(dk1->key->str); + new_dk->ssid = byte_array_dup(dk1->ssid); - /* Check the total length of the merged list */ - if(g_list_length(merged_list) < MAX_ENCRYPTION_KEYS) - merged_list = g_list_append(merged_list,(gpointer)new_dk); - } + /* Check the total length of the merged list */ + if (g_list_length(merged_list) < MAX_ENCRYPTION_KEYS) + merged_list = g_list_append(merged_list,(gpointer)new_dk); + } - /* Look for keys that are present in list2 but aren't in list1 yet... - * Add them to merged_list - */ - for(i=0;ibits = dk2->bits; - new_dk->type = dk2->type; - new_dk->key = g_string_new(dk2->key->str); - new_dk->ssid = byte_array_dup(dk2->ssid); + new_dk->bits = dk2->bits; + new_dk->type = dk2->type; + new_dk->key = g_string_new(dk2->key->str); + new_dk->ssid = byte_array_dup(dk2->ssid); - /* Check the total length of the merged list */ - if(g_list_length(merged_list) < MAX_ENCRYPTION_KEYS) - merged_list = g_list_append(merged_list,(gpointer)new_dk); - } - } + /* Check the total length of the merged list */ + if (g_list_length(merged_list) < MAX_ENCRYPTION_KEYS) + merged_list = g_list_append(merged_list,(gpointer)new_dk); + } + } } return merged_list; @@ -2046,25 +2046,25 @@ free_key_list(GList *list) guint i,n; decryption_key_t *curr_key; - if(list == NULL) - return; + if (list == NULL) + return; n = g_list_length(list); for(i = 0; i < n; i++) { - curr_key = (decryption_key_t*)g_list_nth_data(list,i); + curr_key = (decryption_key_t*)g_list_nth_data(list,i); - /* Free all the strings */ - if(curr_key->key != NULL) - g_string_free(curr_key->key, TRUE); + /* Free all the strings */ + if (curr_key->key != NULL) + g_string_free(curr_key->key, TRUE); - if(curr_key->ssid != NULL) - g_byte_array_free(curr_key->ssid, TRUE); + if (curr_key->ssid != NULL) + g_byte_array_free(curr_key->ssid, TRUE); - /* free the decryption_key_t structure*/ - g_free(curr_key); - curr_key = NULL; + /* free the decryption_key_t structure*/ + g_free(curr_key); + curr_key = NULL; } /* Free the list */ @@ -2082,22 +2082,22 @@ gboolean key_is_in_list(decryption_key_t *dk,GList *list) { guint i,n; - decryption_key_t* curr_key = NULL; + decryption_key_t *curr_key = NULL; gboolean found = FALSE; - if( (list == NULL) || (dk == NULL) ) - return FALSE; + if ( (list == NULL) || (dk == NULL) ) + return FALSE; n = g_list_length(list); - if(n < 1) - return FALSE; + if (n < 1) + return FALSE; for(i = 0; i < n; i++) { - curr_key = (decryption_key_t*)g_list_nth_data(list,i); - if(keys_are_equals(dk,curr_key)) - found = TRUE; + curr_key = (decryption_key_t*)g_list_nth_data(list,i); + if (keys_are_equals(dk,curr_key)) + found = TRUE; } return found; @@ -2110,23 +2110,23 @@ gboolean keys_are_equals(decryption_key_t *k1,decryption_key_t *k2) { - if((k1==NULL) || (k2==NULL)) - return FALSE; + if ((k1==NULL) || (k2==NULL)) + 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 */ - k1->type == k2->type) + if (g_string_equal(k1->key,k2->key) && + (k1->bits == k2->bits) && /* If the previous is TRUE, this must be TRUE as well */ + (k1->type == k2->type)) { - /* Check the ssid... if the key type is WEP, the two fields should be NULL */ - if((k1->ssid == NULL) && (k2->ssid == NULL)) - return TRUE; + /* Check the ssid... if the key type is WEP, the two fields should be NULL */ + if ((k1->ssid == NULL) && (k2->ssid == NULL)) + return TRUE; - /* If they are not null, they must share the same ssid */ - return byte_array_equal(k1->ssid,k2->ssid); + /* If they are not null, they must share the same ssid */ + return byte_array_equal(k1->ssid,k2->ssid); } /* Some field is not equal ... */ @@ -2141,11 +2141,11 @@ keys_are_equals(decryption_key_t *k1,decryption_key_t *k2) gboolean key_lists_are_equal(GList* list1, GList* list2) { - guint n1=0,n2=0; + guint n1 = 0,n2=0; /* XXX - Remove */ - guint wep_n1=0,wep_n2=0; - GList *wep_list1=NULL; - GList *wep_list2=NULL; + guint wep_n1 = 0,wep_n2=0; + GList *wep_list1 = NULL; + GList *wep_list2 = NULL; /* XXX - END*/ guint i/*,j*/; decryption_key_t *dk1=NULL,*dk2=NULL; @@ -2159,21 +2159,21 @@ key_lists_are_equal(GList* list1, GList* list2) */ for(i=0;itype == 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;itype == 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++; + } } /* @@ -2187,8 +2187,8 @@ key_lists_are_equal(GList* list1, GList* list2) * removed. This means that this check will always fail... and the user will * always be asked what to do... and it doesn't make much sense. */ - /* if(n1 != n2) return FALSE; */ - if(wep_n1 != wep_n2) return FALSE; + /* if (n1 != n2) return FALSE; */ + if (wep_n1 != wep_n2) return FALSE; n2 = wep_n2; @@ -2197,12 +2197,12 @@ key_lists_are_equal(GList* list1, GList* list2) dk1=(decryption_key_t*)g_list_nth_data(list1,i); dk2=(decryption_key_t*)g_list_nth_data(list2,i); - if(!g_string_equal(dk1->key,dk2->key)) return FALSE; + if (!g_string_equal(dk1->key,dk2->key)) return FALSE; }*/ for(i=0;iname, "enable_decryption", 17) == 0 && pref->type == PREF_BOOL) { - number = *pref->varp.boolp; + number = *pref->varp.boolp; - if(number) *is_on = TRUE; - else *is_on = FALSE; + if (number) *is_on = TRUE; + else *is_on = FALSE; - return 1; + return 1; } return 0; } @@ -2260,12 +2260,12 @@ airpcap_decryption_on(void) fake_if_info = airpcap_driver_fake_if_info_new(); - if(fake_if_info != NULL) + 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); @@ -2279,31 +2279,31 @@ airpcap_decryption_on(void) void airpcap_if_info_free(airpcap_if_info_t *if_info) { - if(if_info != NULL) + if (if_info != NULL) { - 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); - if(if_info->keysCollection != NULL) - { - g_free(if_info->keysCollection); - if_info->keysCollection = NULL; - } + if (if_info->keysCollection != NULL) + { + g_free(if_info->keysCollection); + if_info->keysCollection = NULL; + } - if(if_info->ip_addr != NULL) - { - g_slist_free(if_info->ip_addr); - if_info->ip_addr = NULL; - } + if (if_info->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; - } + if (if_info != NULL) + { + g_free(if_info); + if_info = NULL; + } } } @@ -2318,12 +2318,12 @@ set_on_off(pref_t *pref, gpointer ud) if (g_ascii_strncasecmp(pref->name, "enable_decryption", 17) == 0 && pref->type == PREF_BOOL) { - if(*is_on) - *pref->varp.boolp = TRUE; - else - *pref->varp.boolp = FALSE; + if (*is_on) + *pref->varp.boolp = TRUE; + else + *pref->varp.boolp = FALSE; - return 1; + return 1; } return 0; } @@ -2372,52 +2372,52 @@ set_airpcap_decryption(gboolean on_off) 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); + /* 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); - airpcap_if_close(ad_driver); - } + airpcap_if_close(ad_driver); + } - airpcap_if_info_free(fake_if_info); + airpcap_if_info_free(fake_if_info); - n = g_list_length(airpcap_if_list); + n = g_list_length(airpcap_if_list); - /* 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); + /* Set to FALSE the decryption for all the adapters */ + /* Apply this change to all the adapters !!! */ + for(i = 0; i < n; i++) + { + curr_if = (airpcap_if_info_t*)g_list_nth_data(airpcap_if_list,i); - if( curr_if != NULL ) - { - ad = airpcap_if_open(curr_if->name, ebuf); - if(ad) - { - 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); - } - } - } + if (curr_if != NULL) + { + ad = airpcap_if_open(curr_if->name, ebuf); + if (ad) + { + curr_if->DecryptionOn = (gboolean)AIRPCAP_DECRYPTION_OFF; + airpcap_if_set_decryption_state(ad,curr_if->DecryptionOn); + /* Save configuration for the curr_if */ + if (!airpcap_if_store_cur_config_as_adapter_default(ad)) + { + success = FALSE; + } + airpcap_if_close(ad); + } + } + } - return success; + return success; } @@ -2429,66 +2429,66 @@ set_airpcap_decryption(gboolean on_off) int load_airpcap(void) { #ifdef _WIN32 - gboolean base_functions = TRUE; + gboolean base_functions = TRUE; gboolean eleven_n_functions = TRUE; - if((AirpcapLib = ws_load_library("airpcap.dll")) == NULL) + if ((AirpcapLib = ws_load_library("airpcap.dll")) == NULL) { - /* Report the error but go on */ - AirpcapVersion = AIRPCAP_DLL_NOT_FOUND; - return AirpcapVersion; + /* Report the error but go on */ + AirpcapVersion = AIRPCAP_DLL_NOT_FOUND; + return AirpcapVersion; } else { - if((g_PAirpcapGetLastError = (AirpcapGetLastErrorHandler) GetProcAddress(AirpcapLib, "AirpcapGetLastError")) == NULL) base_functions = FALSE; - if((g_PAirpcapGetDeviceList = (AirpcapGetDeviceListHandler) GetProcAddress(AirpcapLib, "AirpcapGetDeviceList")) == NULL) base_functions = FALSE; - if((g_PAirpcapFreeDeviceList = (AirpcapFreeDeviceListHandler) GetProcAddress(AirpcapLib, "AirpcapFreeDeviceList")) == NULL) base_functions = FALSE; - if((g_PAirpcapOpen = (AirpcapOpenHandler) GetProcAddress(AirpcapLib, "AirpcapOpen")) == NULL) base_functions = FALSE; - if((g_PAirpcapClose = (AirpcapCloseHandler) GetProcAddress(AirpcapLib, "AirpcapClose")) == NULL) base_functions = FALSE; - if((g_PAirpcapGetLinkType = (AirpcapGetLinkTypeHandler) GetProcAddress(AirpcapLib, "AirpcapGetLinkType")) == NULL) base_functions = FALSE; - if((g_PAirpcapSetLinkType = (AirpcapSetLinkTypeHandler) GetProcAddress(AirpcapLib, "AirpcapSetLinkType")) == NULL) base_functions = FALSE; - if((g_PAirpcapSetKernelBuffer = (AirpcapSetKernelBufferHandler) GetProcAddress(AirpcapLib, "AirpcapSetKernelBuffer")) == NULL) base_functions = FALSE; - if((g_PAirpcapSetFilter = (AirpcapSetFilterHandler) GetProcAddress(AirpcapLib, "AirpcapSetFilter")) == NULL) base_functions = FALSE; - if((g_PAirpcapGetMacAddress = (AirpcapGetMacAddressHandler) GetProcAddress(AirpcapLib, "AirpcapGetMacAddress")) == NULL) base_functions = FALSE; - if((g_PAirpcapSetMinToCopy = (AirpcapSetMinToCopyHandler) GetProcAddress(AirpcapLib, "AirpcapSetMinToCopy")) == NULL) base_functions = FALSE; - if((g_PAirpcapGetReadEvent = (AirpcapGetReadEventHandler) GetProcAddress(AirpcapLib, "AirpcapGetReadEvent")) == NULL) base_functions = FALSE; - if((g_PAirpcapRead = (AirpcapReadHandler) GetProcAddress(AirpcapLib, "AirpcapRead")) == NULL) base_functions = FALSE; - if((g_PAirpcapGetStats = (AirpcapGetStatsHandler) GetProcAddress(AirpcapLib, "AirpcapGetStats")) == NULL) base_functions = FALSE; - if((g_PAirpcapTurnLedOn = (AirpcapTurnLedOnHandler) GetProcAddress(AirpcapLib, "AirpcapTurnLedOn")) == NULL) base_functions = FALSE; - if((g_PAirpcapTurnLedOff = (AirpcapTurnLedOffHandler) GetProcAddress(AirpcapLib, "AirpcapTurnLedOff")) == NULL) base_functions = FALSE; - if((g_PAirpcapGetDeviceChannel = (AirpcapGetDeviceChannelHandler) GetProcAddress(AirpcapLib, "AirpcapGetDeviceChannel")) == NULL) base_functions = FALSE; - if((g_PAirpcapSetDeviceChannel = (AirpcapSetDeviceChannelHandler) GetProcAddress(AirpcapLib, "AirpcapSetDeviceChannel")) == NULL) base_functions = FALSE; - if((g_PAirpcapGetFcsPresence = (AirpcapGetFcsPresenceHandler) GetProcAddress(AirpcapLib, "AirpcapGetFcsPresence")) == NULL) base_functions = FALSE; - if((g_PAirpcapSetFcsPresence = (AirpcapSetFcsPresenceHandler) GetProcAddress(AirpcapLib, "AirpcapSetFcsPresence")) == NULL) base_functions = FALSE; - if((g_PAirpcapGetFcsValidation = (AirpcapGetFcsValidationHandler) GetProcAddress(AirpcapLib, "AirpcapGetFcsValidation")) == NULL) base_functions = FALSE; - if((g_PAirpcapSetFcsValidation = (AirpcapSetFcsValidationHandler) GetProcAddress(AirpcapLib, "AirpcapSetFcsValidation")) == NULL) base_functions = FALSE; - if((g_PAirpcapGetDeviceKeys = (AirpcapGetDeviceKeysHandler) GetProcAddress(AirpcapLib, "AirpcapGetDeviceKeys")) == NULL) base_functions = FALSE; - if((g_PAirpcapSetDeviceKeys = (AirpcapSetDeviceKeysHandler) GetProcAddress(AirpcapLib, "AirpcapSetDeviceKeys")) == NULL) base_functions = FALSE; - if((g_PAirpcapGetDecryptionState = (AirpcapGetDecryptionStateHandler) GetProcAddress(AirpcapLib, "AirpcapGetDecryptionState")) == NULL) base_functions = FALSE; - if((g_PAirpcapSetDecryptionState = (AirpcapSetDecryptionStateHandler) GetProcAddress(AirpcapLib, "AirpcapSetDecryptionState")) == NULL) base_functions = FALSE; - if((g_PAirpcapStoreCurConfigAsAdapterDefault = (AirpcapStoreCurConfigAsAdapterDefaultHandler) GetProcAddress(AirpcapLib, "AirpcapStoreCurConfigAsAdapterDefault")) == NULL) base_functions = FALSE; - if((g_PAirpcapGetVersion = (AirpcapGetVersionHandler) GetProcAddress(AirpcapLib, "AirpcapGetVersion")) == NULL) base_functions = FALSE; - if((g_PAirpcapGetDriverDecryptionState = (AirpcapGetDriverDecryptionStateHandler) GetProcAddress(AirpcapLib, "AirpcapGetDriverDecryptionState")) == NULL) base_functions = FALSE; - if((g_PAirpcapSetDriverDecryptionState = (AirpcapSetDriverDecryptionStateHandler) GetProcAddress(AirpcapLib, "AirpcapSetDriverDecryptionState")) == NULL) base_functions = FALSE; - if((g_PAirpcapGetDriverKeys = (AirpcapGetDriverKeysHandler) GetProcAddress(AirpcapLib, "AirpcapGetDriverKeys")) == NULL) base_functions = FALSE; - if((g_PAirpcapSetDriverKeys = (AirpcapSetDriverKeysHandler) GetProcAddress(AirpcapLib, "AirpcapSetDriverKeys")) == NULL) base_functions = FALSE; + 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; + /* 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; - } + 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 */ @@ -2515,12 +2515,12 @@ get_runtime_airpcap_version(GString *str) /* See if the DLL has been loaded successfully. Bail if it hasn't */ if (AirpcapLoaded == FALSE) { - g_string_append(str, "without AirPcap"); - return; + g_string_append(str, "without AirPcap"); + return; } g_PAirpcapGetVersion(&vmaj, &vmin, &vrev, &build); g_string_append_printf(str, "with AirPcap %d.%d.%d build %d", vmaj, vmin, - vrev, build); + vrev, build); } #endif /* HAVE_AIRPCAP */