#include <epan/strutil.h>
#include <epan/frequency-utils.h>
#include "capture_ui_utils.h"
+#include <wsutil/file_util.h>
-#include "simple_dialog.h"
+#include "ui/simple_dialog.h"
#include <airpcap.h>
#include "airpcap_loader.h"
-/*
- * We load dynamically the dag library in order link it only when
- * it's present on the system
- */
-static void * AirpcapLib = NULL;
-
/*
* Set to TRUE if the DLL was successfully loaded AND all functions
* are present.
*/
static gboolean AirpcapLoaded = FALSE;
-static int AirpcapVersion = 3;
+#ifdef _WIN32
+/*
+ * We load dynamically the dag library in order link it only when
+ * it's present on the system
+ */
+static void * AirpcapLib = NULL;
static AirpcapGetLastErrorHandler g_PAirpcapGetLastError;
-static AirpcapGetDeviceListHandler g_PAirpcapGetDeviceList;
-static AirpcapFreeDeviceListHandler g_PAirpcapFreeDeviceList;
-static AirpcapOpenHandler g_PAirpcapOpen;
-static AirpcapCloseHandler g_PAirpcapClose;
-static AirpcapGetLinkTypeHandler g_PAirpcapGetLinkType;
-static AirpcapSetLinkTypeHandler g_PAirpcapSetLinkType;
static AirpcapSetKernelBufferHandler g_PAirpcapSetKernelBuffer;
static AirpcapSetFilterHandler g_PAirpcapSetFilter;
static AirpcapGetMacAddressHandler g_PAirpcapGetMacAddress;
static AirpcapGetReadEventHandler g_PAirpcapGetReadEvent;
static AirpcapReadHandler g_PAirpcapRead;
static AirpcapGetStatsHandler g_PAirpcapGetStats;
+#endif
+
+static int AirpcapVersion = 3;
+
+static AirpcapGetDeviceListHandler g_PAirpcapGetDeviceList;
+static AirpcapFreeDeviceListHandler g_PAirpcapFreeDeviceList;
+static AirpcapOpenHandler g_PAirpcapOpen;
+static AirpcapCloseHandler g_PAirpcapClose;
+static AirpcapGetLinkTypeHandler g_PAirpcapGetLinkType;
+static AirpcapSetLinkTypeHandler g_PAirpcapSetLinkType;
static AirpcapTurnLedOnHandler g_PAirpcapTurnLedOn;
static AirpcapTurnLedOffHandler g_PAirpcapTurnLedOff;
static AirpcapGetDeviceChannelHandler g_PAirpcapGetDeviceChannel;
module_t *wlan_prefs = NULL;
Dot11Channel *pSupportedChannels;
-guint32 numSupportedChannels;
+guint numSupportedChannels;
static AirpcapChannelInfo LegacyChannels[] =
{
{2484, 0, {0,0,0}},
};
-static guint32 num_legacy_channels = 14;
+static guint num_legacy_channels = 14;
/*
* Callback used by the load_wlan_keys() routine in order to read a WEP decryption key
static guint
get_wep_key(pref_t *pref, gpointer ud)
{
- gchar *my_string = NULL;
+ gchar *key_string = NULL;
+ guint8 key_type = AIRPDCAP_KEY_TYPE_WEP;
keys_cb_data_t* user_data;
decryption_key_t* new_key;
if (g_ascii_strncasecmp(pref->name, "wep_key", 7) == 0 && pref->type == PREF_STRING)
{
- my_string = g_strdup(*pref->varp.string);
+ /* strip out key type */
+ if (g_ascii_strncasecmp(*pref->varp.string, STRING_KEY_TYPE_WEP ":", 4) == 0) {
+ key_string = (gchar*)(*pref->varp.string)+4;
+ }
+ else if (g_ascii_strncasecmp(*pref->varp.string, STRING_KEY_TYPE_WPA_PWD ":", 8) == 0) {
+ key_string = (gchar*)(*pref->varp.string)+8;
+ key_type = AIRPDCAP_KEY_TYPE_WPA_PWD;
+ }
+ else if (g_ascii_strncasecmp(*pref->varp.string, STRING_KEY_TYPE_WPA_PSK ":", 8) == 0) {
+ key_string = (gchar*)(*pref->varp.string)+8;
+ key_type = AIRPDCAP_KEY_TYPE_WPA_PSK;
+ }
+ else {
+ key_type = AIRPDCAP_KEY_TYPE_WEP;
+ key_string = (gchar*)*pref->varp.string;
+ }
/* Here we have the string describing the key... */
- new_key = parse_key_string(my_string);
+ new_key = parse_key_string(key_string, key_type);
- if( new_key != NULL)
- {
- /* Key is added only if not null ... */
- user_data->list = g_list_append(user_data->list,new_key);
- user_data->number_of_keys++;
- user_data->current_index++;
- }
+ if( new_key != NULL)
+ {
+ /* Key is added only if not null ... */
+ user_data->list = g_list_append(user_data->list,new_key);
+ user_data->number_of_keys++;
+ user_data->current_index++;
+ }
}
return 0;
}
* properly into the airpcap adapter.
*/
gboolean
-load_wlan_driver_wep_keys()
+load_wlan_driver_wep_keys(void)
{
keys_cb_data_t* user_data;
guint i;
- gchar *tmp = NULL;
/* Retrieve the wlan preferences */
wlan_prefs = prefs_find_module("wlan");
GString *new_key;
gchar s[3];
PAirpcapKeysCollection KeysCollection;
- guint32 KeysCollectionSize;
+ guint KeysCollectionSize;
guint8 KeyByte;
guint keys_in_list = 0;
decryption_key_t* key_item = NULL;
key_item = (decryption_key_t*)g_list_nth_data(key_list,i);
new_key = g_string_new(key_item->key->str);
- KeysCollection->Keys[i].KeyLen = new_key->len / 2;
+ KeysCollection->Keys[i].KeyLen = (guint) new_key->len / 2;
memset(&KeysCollection->Keys[i].KeyData, 0, sizeof(KeysCollection->Keys[i].KeyData));
for(j = 0 ; j < new_key->len; j += 2)
GString *new_key;
gchar s[3];
PAirpcapKeysCollection KeysCollection;
- guint32 KeysCollectionSize;
+ guint KeysCollectionSize;
guint8 KeyByte;
guint keys_in_list = 0;
decryption_key_t* key_item = NULL;
new_key = g_string_new(key_item->key->str);
- KeysCollection->Keys[y].KeyLen = new_key->len / 2;
+ KeysCollection->Keys[y].KeyLen = (guint) new_key->len / 2;
memset(&KeysCollection->Keys[y].KeyData, 0, sizeof(KeysCollection->Keys[y].KeyData));
for(j = 0 ; j < new_key->len; j += 2)
* Function used to save to the preference file the Decryption Keys.
*/
int
-save_wlan_driver_wep_keys()
+save_wlan_driver_wep_keys(void)
{
GList* key_list = NULL;
char* tmp_key = NULL;
save_wlan_wireshark_wep_keys(GList* key_ls)
{
GList* key_list = NULL;
- char* tmp_key = NULL;
guint keys_in_list,i;
keys_cb_data_t* user_data;
- airpcap_if_info_t* fake_info_if = NULL;
decryption_key_t* tmp_dk;
/* Retrieve the wlan preferences */
* Retrieve the state of the Airpcap DLL
*/
int
-airpcap_get_dll_state()
+airpcap_get_dll_state(void)
{
return AirpcapVersion;
}
* Airpcap wrapper, used to get the supported channels of an airpcap adapter
*/
gboolean
-airpcap_if_get_device_supported_channels(PAirpcapHandle ah, AirpcapChannelInfo **cInfo, guint32 * nInfo)
+airpcap_if_get_device_supported_channels(PAirpcapHandle ah, AirpcapChannelInfo **cInfo, guint * nInfo)
{
if (!AirpcapLoaded) return FALSE;
if (airpcap_get_dll_state() == AIRPCAP_DLL_OLD){
* Airpcap wrapper, used to get the supported channels of an airpcap adapter
*/
Dot11Channel*
-airpcap_if_get_device_supported_channels_array(PAirpcapHandle ah, guint32 * pNumSupportedChannels)
+airpcap_if_get_device_supported_channels_array(PAirpcapHandle ah, guint * pNumSupportedChannels)
{
AirpcapChannelInfo *chanInfo;
- guint32 i=0, j=0, numInfo = 0;
+ guint i=0, j=0, numInfo = 0;
if (!AirpcapLoaded)
return NULL;
for (i = 0; i < numInfo; i++)
{
- guint32 supportedChannel = 0xFFFFFFFF;
+ guint supportedChannel = G_MAXUINT;
/*
* search if we have it already
}
}
- if (supportedChannel == 0xFFFFFFFF)
+ if (supportedChannel == G_MAXUINT)
{
/*
* not found, create a new item
switch(chanInfo[i].ExtChannel)
{
case -1:
- pSupportedChannels[numSupportedChannels].Flags = FLAG_CAN_BE_HIGH;
+ pSupportedChannels[numSupportedChannels].Flags = FLAG_CAN_BE_LOW;
break;
case +1:
- pSupportedChannels[numSupportedChannels].Flags = FLAG_CAN_BE_LOW;
+ pSupportedChannels[numSupportedChannels].Flags = FLAG_CAN_BE_HIGH;
break;
case 0:
default:
switch(chanInfo[i].ExtChannel)
{
case -1:
- pSupportedChannels[supportedChannel].Flags |= FLAG_CAN_BE_HIGH;
+ pSupportedChannels[supportedChannel].Flags |= FLAG_CAN_BE_LOW;
break;
case +1:
- pSupportedChannels[supportedChannel].Flags |= FLAG_CAN_BE_LOW;
+ pSupportedChannels[supportedChannel].Flags |= FLAG_CAN_BE_HIGH;
break;
case 0:
default:
{
if (!AirpcapLoaded) return FALSE;
if (airpcap_get_dll_state() == AIRPCAP_DLL_OLD){
- guint channel = 0;
+ gint channel = 0;
channel = ieee80211_mhz_to_chan(ChannelInfo.Frequency);
if (channel < 0){
if (airpcap_get_dll_state() == AIRPCAP_DLL_OLD){
guint channel = 0;
- guint32 chan_freq = 0;
+ guint chan_freq = 0;
if (!airpcap_if_get_device_channel(ah, &channel)) return FALSE;
ad = airpcap_if_open(name, ebuf);
if(ad)
{
- if_info = g_malloc(sizeof (airpcap_if_info_t));
+ if_info = g_malloc0(sizeof (airpcap_if_info_t));
if_info->name = g_strdup(name);
if (description == NULL){
if_info->description = NULL;
* This function will create a new fake drivers' interface, to load global keys...
*/
airpcap_if_info_t*
-airpcap_driver_fake_if_info_new()
+airpcap_driver_fake_if_info_new(void)
{
PAirpcapHandle ad;
gchar ebuf[AIRPCAP_ERRBUF_SIZE];
g_print(" LINKTYPE: %d\n",if_info->linkType);
g_print(" LOOPBACK: %s\n",if_info->loopback ? "YES" : "NO");
g_print(" (GTK) TAG: %d\n",if_info->tag);
- g_print("SUPPORTED CHANNELS POINTER: %lu\n",if_info->pSupportedChannels);
- g_print(" NUM SUPPORTED CHANNELS: %lu\n",if_info->numSupportedChannels);
+ g_print("SUPPORTED CHANNELS POINTER: %p\n",if_info->pSupportedChannels);
+ g_print(" NUM SUPPORTED CHANNELS: %u\n",if_info->numSupportedChannels);
for(i=0; i<(if_info->numSupportedChannels); i++){
g_print("\n SUPPORTED CHANNEL #%u\n",i+1);
g_print(" CHANNEL: %u\n",if_info->pSupportedChannels[i].Channel);
- g_print(" FREQUENCY: %lu\n",if_info->pSupportedChannels[i].Frequency);
- g_print(" FLAGS: %lu\n",if_info->pSupportedChannels[i].Flags);
+ g_print(" FREQUENCY: %u\n",if_info->pSupportedChannels[i].Frequency);
+ g_print(" FLAGS: %u\n",if_info->pSupportedChannels[i].Flags);
}
g_print("\n\n");
}
{
GList *il = NULL;
airpcap_if_info_t *if_info;
- int i, n_adapts;
+ int n_adapts;
AirpcapDeviceDescription *devsList, *adListEntry;
char errbuf[PCAP_ERRBUF_SIZE];
+ *err = 0;
+
if (!AirpcapLoaded)
{
*err = AIRPCAP_NOT_LOADED;
* Insert the adapters in our list
*/
adListEntry = devsList;
- for(i = 0; i < n_adapts; i++)
+ while(adListEntry)
{
if_info = airpcap_if_info_new(adListEntry->Name, adListEntry->Description);
if (if_info != NULL){
g_PAirpcapFreeDeviceList(devsList);
- *err = 0;
return il;
}
*/
airpcap_if_info_t* get_airpcap_if_from_name(GList* if_list, const gchar* name)
{
- unsigned int ifn;
- GList* curr;
- airpcap_if_info_t* if_info;
-
- ifn = 0;
- if(if_list != NULL)
- {
- while( ifn < g_list_length(if_list) )
- {
- curr = g_list_nth(if_list, ifn);
+ GList* curr;
+ airpcap_if_info_t* if_info;
- if_info = NULL;
- if(curr != NULL)
- if_info = curr->data;
- if(if_info != NULL)
- {
- if ( g_ascii_strcasecmp(if_info->name,name) == 0
-#ifdef HAVE_PCAP_REMOTE /* The interface will be prepended with "rpcap://" */
- || g_str_has_suffix(name, if_info->name)
-#endif
- )
- {
- return if_info;
+ for (curr = g_list_first(if_list); curr; curr = g_list_next(curr)) {
+ if_info = (airpcap_if_info_t *)curr->data;
+ if (if_info && (g_ascii_strcasecmp(if_info->name, name) == 0)) {
+ return (if_info);
}
- }
- ifn++;
}
- }
- return NULL;
+ return (NULL);
}
/*
airpcap_get_key_string(AirpcapKey key)
{
unsigned int j = 0;
- unsigned int l = 0;
gchar *dst,*src;
dst = NULL;
for(j = 0; j < key.KeyLen; j++)
{
- src = g_strdup_printf("%.2x\0", key.KeyData[j]);
+ src = g_strdup_printf("%.2x", key.KeyData[j]);
/*
* XXX - use g_strconcat() or GStrings instead ???
*/
- l = g_strlcat(dst,src,WEP_KEY_MAX_CHAR_SIZE+1);
+ g_strlcat(dst, src, WEP_KEY_MAX_CHAR_SIZE+1);
}
g_free(src);
}
}
else
{
- number = g_strdup_printf("%.2u\0",n);
+ number = g_strdup_printf("%.2u",n);
}
return number;
airpcap_if_info_t*
airpcap_get_default_if(GList* airpcap_if_list)
{
- int ifn = 0;
- GList* popdown_if_list = NULL;
- GList* curr = NULL;
-
gchar* s;
airpcap_if_info_t* if_info = NULL;
g_free(tmp_key);
/* BITS */
- new_key->bits = new_key->key->len *4; /* every char is 4 bits in WEP keys (it is an hexadecimal number) */
+ new_key->bits = (guint) new_key->key->len *4; /* every char is 4 bits in WEP keys (it is an hexadecimal number) */
/* SSID not used in WEP keys */
new_key->ssid = NULL;
* keys for the global AirPcap driver... returns NULL if no keys are found.
*/
GList*
-get_airpcap_driver_keys()
+get_airpcap_driver_keys(void)
{
/* tmp vars */
char* tmp_key = NULL;
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 hexadecimal number) */
+ new_key->bits = (guint) new_key->key->len *4; /* every char is 4 bits in WEP keys (it is an hexadecimal number) */
/* SSID not used in WEP keys */
new_key->ssid = NULL;
* no key is found
*/
GList*
-get_wireshark_keys()
+get_wireshark_keys(void)
{
keys_cb_data_t* wep_user_data = NULL;
- gchar *tmp = NULL;
-
GList* final_list = NULL;
GList* wep_final_list = NULL;
/*
* Returns TRUE if the Wireshark decryption is active, false otherwise
+ * XXX - Should we just add a routine to packet-ieee80211.c to grab this directly?
*/
gboolean
-wireshark_decryption_on()
+wireshark_decryption_on(void)
{
gboolean is_on;
* Returns TRUE if the AirPcap decryption for the current adapter is active, false otherwise
*/
gboolean
-airpcap_decryption_on()
+airpcap_decryption_on(void)
{
gboolean is_on = FALSE;
{
number = *pref->varp.boolp;
- g_free((void *)*pref->varp.boolp);
if(*is_on)
*pref->varp.boolp = TRUE;
else
*/
int load_airpcap(void)
{
+#ifdef _WIN32
gboolean base_functions = TRUE;
gboolean eleven_n_functions = TRUE;
-#ifdef _WIN32
- if((AirpcapLib = LoadLibrary(TEXT("airpcap.dll"))) == NULL)
+ if((AirpcapLib = ws_load_library("airpcap.dll")) == NULL)
{
/* Report the error but go on */
AirpcapVersion = AIRPCAP_DLL_NOT_FOUND;
git.samba.org / obnox / wireshark / wip.git / blobdiff