From 4c93ff1b8a838b6742f8701c658936222cfc0e31 Mon Sep 17 00:00:00 2001 From: Anders Broman Date: Tue, 31 May 2011 21:34:23 +0000 Subject: [PATCH] REmove the check for HAVE_AIRPDCAP svn path=/trunk/; revision=37494 --- airpcap.h | 2 +- epan/dissectors/packet-ieee80211.c | 233 ----------------------------- gtk/airpcap_dlg.c | 22 --- gtk/airpcap_gui_utils.c | 18 +-- gtk/airpcap_gui_utils.h | 2 - gtk/main.c | 8 +- gtk/main_airpcap_toolbar.c | 2 - 7 files changed, 3 insertions(+), 284 deletions(-) diff --git a/airpcap.h b/airpcap.h index 4b137aebd2..7d90031ae7 100644 --- a/airpcap.h +++ b/airpcap.h @@ -37,7 +37,7 @@ extern "C" { #endif -/*! +/* \mainpage AirPcap interface documentation \section Introduction diff --git a/epan/dissectors/packet-ieee80211.c b/epan/dissectors/packet-ieee80211.c index 93de4a6938..c555bbda38 100644 --- a/epan/dissectors/packet-ieee80211.c +++ b/epan/dissectors/packet-ieee80211.c @@ -120,9 +120,7 @@ #include "packet-wifi-p2p.h" /* Davide Schiera (2006-11-22): including AirPDcap project */ -#ifdef HAVE_AIRPDCAP #include -#endif /* Davide Schiera (2006-11-22) ---------------------------------------------- */ #ifndef roundup2 @@ -199,18 +197,13 @@ static void* uat_wep_key_record_copy_cb(void* n, const void* o, size_t siz _U_) static void uat_wep_key_record_update_cb(void* r, const char** err) { uat_wep_key_record_t* rec = (uat_wep_key_record_t *)r; -#ifdef HAVE_AIRPDCAP decryption_key_t* dk; gchar* tmpk; -#else - GByteArray *bytes; -#endif if (rec->string == NULL) { *err = ep_strdup_printf("Key can't be blank"); } else { g_strstrip(rec->string); -#ifdef HAVE_AIRPDCAP tmpk = g_strdup(rec->string); dk = parse_key_string(tmpk); @@ -240,17 +233,6 @@ static void uat_wep_key_record_update_cb(void* r, const char** err) { } else { *err = ep_strdup_printf("Invalid key format"); } -#else - /* Figure out how many valid keys we have */ - bytes = g_byte_array_new(); - if ((wep_str_to_bytes(rec->string, bytes) == 0) || - (bytes->len == 0) || - (bytes->len > 32)) { - *err = ep_strdup_printf("Invalid key format"); - } - - g_byte_array_free(bytes, TRUE); -#endif } } @@ -267,15 +249,8 @@ UAT_CSTRING_CB_DEF(uat_wep_key_records, string, uat_wep_key_record_t) static gboolean enable_decryption = FALSE; static void init_wepkeys(void); -#ifndef HAVE_AIRPDCAP -static guint8 **wep_keys = NULL; -static int *wep_keylens = NULL; -static tvbuff_t *try_decrypt_wep(tvbuff_t *tvb, guint32 offset, guint32 len); -static int wep_decrypt(guint8 *buf, guint32 len, int key_override); -#else /* Davide Schiera (2006-11-26): created function to decrypt WEP and WPA/WPA2 */ static tvbuff_t *try_decrypt(tvbuff_t *tvb, guint32 offset, guint32 len, guint8 *algorithm, guint32 *sec_header, guint32 *sec_trailer); -#endif static int weak_iv(guchar *iv); #define SSWAP(a,b) {guint8 tmp = s[a]; s[a] = s[b]; s[b] = tmp;} @@ -2429,11 +2404,7 @@ static const value_string tdls_action_codes[] ={ {0, NULL} }; -#ifdef HAVE_AIRPDCAP AIRPDCAP_CONTEXT airpdcap_ctx; -#else -int airpdcap_ctx; -#endif #define PSMP_STA_INFO_BROADCAST 0 #define PSMP_STA_INFO_MULTICAST 1 @@ -6567,9 +6538,7 @@ add_tagged_field(packet_info * pinfo, proto_tree * tree, tvbuff_t * tvb, int off } ssid = tvb_get_ephemeral_string(tvb, offset + 2, tag_len); -#ifdef HAVE_AIRPDCAP AirPDcapSetLastSSID(&airpdcap_ctx, (CHAR *) ssid, tag_len); -#endif proto_tree_add_item(tree, hf_ieee80211_tag_ssid, tvb, offset + 2, tag_len, FALSE); if (tag_len > 0) { proto_item_append_text(ti, ": %s", ssid); @@ -9460,7 +9429,6 @@ dissect_ieee80211_common (tvbuff_t * tvb, packet_info * pinfo, } } /* end of qos control field */ -#ifdef HAVE_AIRPDCAP /* Davide Schiera (2006-11-21): process handshake packet with AirPDcap */ /* the processing will take care of 4-way handshake sessions for WPA */ /* and WPA2 decryption */ @@ -9469,7 +9437,6 @@ dissect_ieee80211_common (tvbuff_t * tvb, packet_info * pinfo, AirPDcapPacketProcess(&airpdcap_ctx, enc_data, hdr_len, hdr_len+reported_len, NULL, 0, NULL, TRUE, FALSE); } /* Davide Schiera -------------------------------------------------------- */ -#endif /* * No-data frames don't have a body. @@ -9550,17 +9517,10 @@ dissect_ieee80211_common (tvbuff_t * tvb, packet_info * pinfo, guint8 key, keybyte; /* Davide Schiera (2006-11-27): define algorithms constants and macros */ -#ifdef HAVE_AIRPDCAP #define PROTECTION_ALG_WEP AIRPDCAP_KEY_TYPE_WEP #define PROTECTION_ALG_TKIP AIRPDCAP_KEY_TYPE_TKIP #define PROTECTION_ALG_CCMP AIRPDCAP_KEY_TYPE_CCMP #define PROTECTION_ALG_RSNA PROTECTION_ALG_CCMP | PROTECTION_ALG_TKIP -#else -#define PROTECTION_ALG_WEP 0 -#define PROTECTION_ALG_TKIP 1 -#define PROTECTION_ALG_CCMP 2 -#define PROTECTION_ALG_RSNA PROTECTION_ALG_CCMP | PROTECTION_ALG_TKIP -#endif guint8 algorithm=G_MAXUINT8; /* Davide Schiera (2006-11-27): added macros to check the algorithm */ /* used could be TKIP or CCMP */ @@ -9568,14 +9528,12 @@ dissect_ieee80211_common (tvbuff_t * tvb, packet_info * pinfo, #define IS_CCMP(tvb, hdr_len) (tvb_get_guint8(tvb, hdr_len + 2) == 0) /* Davide Schiera ----------------------------------------------------- */ -#ifdef HAVE_AIRPDCAP /* Davide Schiera (2006-11-21): recorded original lengths to pass them */ /* to the packets process function */ guint32 sec_header=0; guint32 sec_trailer=0; next_tvb = try_decrypt(tvb, hdr_len, reported_len, &algorithm, &sec_header, &sec_trailer); -#endif /* Davide Schiera ----------------------------------------------------- */ keybyte = tvb_get_guint8(tvb, hdr_len + 3); @@ -9587,7 +9545,6 @@ dissect_ieee80211_common (tvbuff_t * tvb, packet_info * pinfo, if (tree) { proto_item *extiv_fields; -#ifdef HAVE_AIRPDCAP /* Davide Schiera (2006-11-27): differentiated CCMP and TKIP if */ /* it's possible */ if (algorithm==PROTECTION_ALG_TKIP) @@ -9598,7 +9555,6 @@ dissect_ieee80211_common (tvbuff_t * tvb, packet_info * pinfo, "CCMP parameters"); else { /* Davide Schiera -------------------------------------------- */ -#endif /* Davide Schiera (2006-11-27): differentiated CCMP and TKIP if*/ /* it's possible */ if (IS_TKIP(tvb, hdr_len)) { @@ -9612,9 +9568,7 @@ dissect_ieee80211_common (tvbuff_t * tvb, packet_info * pinfo, } else extiv_fields = proto_tree_add_text(hdr_tree, tvb, hdr_len, 8, "TKIP/CCMP parameters"); -#ifdef HAVE_AIRPDCAP } -#endif proto_item_set_len (ti, hdr_len + 8); wep_tree = proto_item_add_subtree (extiv_fields, ett_wep_parameters); @@ -9645,7 +9599,6 @@ dissect_ieee80211_common (tvbuff_t * tvb, packet_info * pinfo, /* It is unknown whether this is TKIP or CCMP, so let's not even try to * parse TKIP Michael MIC+ICV or CCMP MIC. */ -#ifdef HAVE_AIRPDCAP /* Davide Schiera (2006-11-21): enable TKIP and CCMP decryption */ /* checking for the trailer */ if (next_tvb!=NULL) { @@ -9668,7 +9621,6 @@ dissect_ieee80211_common (tvbuff_t * tvb, packet_info * pinfo, } } /* Davide Schiera -------------------------------------------------- */ -#endif } else { /* No Ext. IV - WEP packet */ /* @@ -9759,13 +9711,8 @@ dissect_ieee80211_common (tvbuff_t * tvb, packet_info * pinfo, g_strlcpy (wlan_stats.protection, "Unknown", MAX_PROTECT_LEN); } -#ifndef HAVE_AIRPDCAP - if (can_decrypt) - next_tvb = try_decrypt_wep(tvb, hdr_len, reported_len + 8); -#else /* Davide Schiera (2006-11-26): decrypted before parsing header and */ /* protection header */ -#endif if (!can_decrypt || next_tvb == NULL) { /* * WEP decode impossible or failed, treat payload as raw data @@ -12557,10 +12504,8 @@ proto_register_ieee80211 (void) static const value_string wep_type_vals[] = { { 0, STRING_KEY_TYPE_WEP }, -#ifdef HAVE_AIRPDCAP { 1, STRING_KEY_TYPE_WPA_PWD }, { 2, STRING_KEY_TYPE_WPA_PSK }, -#endif { 0x00, NULL } }; @@ -15566,15 +15511,10 @@ proto_register_ieee80211 (void) UAT_FLD_VS(uat_wep_key_records, key, "Key type", wep_type_vals, "Decryption key type used"), -#ifdef HAVE_AIRPDCAP UAT_FLD_CSTRING(uat_wep_key_records, string, "Key", "wep:\n" "wpa-pwd:[:]\n" "wpa-psk:"), -#else - UAT_FLD_CSTRING(uat_wep_key_records, string, "Key", - "wep:\n"), -#endif UAT_END_FIELDS }; @@ -15743,18 +15683,11 @@ proto_register_ieee80211 (void) prefs_register_obsolete_preference(wlan_module, "wep_keys"); -#ifdef HAVE_AIRPDCAP /* Davide Schiera (2006-11-26): added reference to WPA/WPA2 decryption */ prefs_register_bool_preference(wlan_module, "enable_decryption", "Enable decryption", "Enable WEP and WPA/WPA2 decryption", &enable_decryption); -#else - prefs_register_bool_preference(wlan_module, "enable_decryption", - "Enable decryption", "Enable WEP decryption", - &enable_decryption); -#endif -#ifdef HAVE_AIRPDCAP prefs_register_static_text_preference(wlan_module, "info_decryption_key", "Key examples: 01:02:03:04:05 (40/64-bit WEP),\n" "010203040506070809101111213 (104/128-bit WEP),\n" @@ -15762,12 +15695,6 @@ proto_register_ieee80211 (void) "wpa-psk:0102030405...6061626364 (WPA + 256-bit key). " "Invalid keys will be ignored.", "Valid key formats"); -#else - prefs_register_static_text_preference(wlan_module, "info_decryption_key", - "Key examples: 01:02:03:04:05 (40/64-bit WEP),\n" - "010203040506070809101111213 (104/128-bit WEP)", - "Valid key formats"); -#endif wep_uat = uat_new("WEP Keys", sizeof(uat_wep_key_record_t), /* record size */ @@ -15884,7 +15811,6 @@ proto_reg_handoff_ieee80211(void) data_encap_handle); } -#ifdef HAVE_AIRPDCAP /* Davide Schiera (2006-11-26): this function will try to decrypt with WEP or */ /* WPA and return a tvb to the caller to add a new tab. It returns the */ /* algorithm used for decryption (WEP, TKIP, CCMP) and the header and */ @@ -15939,52 +15865,9 @@ try_decrypt(tvbuff_t *tvb, guint offset, guint len, guint8 *algorithm, guint32 * return decr_tvb; } /* Davide Schiera ----------------------------------------------------------- */ -#else -static tvbuff_t *try_decrypt_wep(tvbuff_t *tvb, guint32 offset, guint32 len) { - const guint8 *enc_data; - guint8 *tmp = NULL; - int i; - tvbuff_t *decr_tvb = NULL; - - if (! enable_decryption) - return NULL; - - enc_data = tvb_get_ptr(tvb, offset, len); - - if ((tmp = g_malloc(len)) == NULL) - return NULL; /* krap! */ - - /* try once with the key index in the packet, then look through our list. */ - for (i = 0; i < num_wepkeys; i++) { - /* copy the encrypted data over to the tmp buffer */ -#if 0 - printf("trying %d\n", i); -#endif - memcpy(tmp, enc_data, len); - if (wep_decrypt(tmp, len, i) == 0) { - - /* decrypt successful, let's set up a new data tvb. */ - decr_tvb = tvb_new_child_real_data(tvb, tmp, len-8, len-8); - tvb_set_free_cb(decr_tvb, g_free); - - break; - } - } - - if (!decr_tvb) - g_free(tmp); - -#if 0 - printf("de-wep %p\n", decr_tvb); -#endif - - return decr_tvb; -} -#endif /* Collect our WEP and WPA keys */ -#ifdef HAVE_AIRPDCAP static void set_airpdcap_keys(void) { @@ -16071,123 +15954,8 @@ void set_airpdcap_keys(void) g_byte_array_free(bytes, TRUE); } -#endif - -#ifndef HAVE_AIRPDCAP -/* de-weps the block. if successful, buf* will point to the data start. */ -static int wep_decrypt(guint8 *buf, guint32 len, int keyidx) { - guint32 i, j, k, crc, keylen; - guint8 s[256], key[128], c_crc[4]; - guint8 *dpos, *cpos; - - /* Needs to be at least 8 bytes of payload */ - if (len < 8) - return -1; - - /* initialize the first bytes of the key from the IV */ - key[0] = buf[0]; - key[1] = buf[1]; - key[2] = buf[2]; - - if (keyidx < 0 || keyidx >= num_wepkeys) - return -1; - - keylen = wep_keylens[keyidx]; - - if (keylen == 0) - return -1; - if (wep_keys[keyidx] == NULL) - return -1; - - keylen+=3; /* add in ICV bytes */ - - /* copy the rest of the key over from the designated key */ - memcpy(key+3, wep_keys[keyidx], wep_keylens[keyidx]); - -#if 0 - printf("%d: %02x %02x %02x (%d %d) %02x:%02x:%02x:%02x:%02x\n", len, key[0], key[1], key[2], keyidx, keylen, key[3], key[4], key[5], key[6], key[7]); -#endif - - /* set up the RC4 state */ - for (i = 0; i < 256; i++) - s[i] = i; - j = 0; - for (i = 0; i < 256; i++) { - j = (j + s[i] + key[i % keylen]) & 0xff; - SSWAP(i,j); - } - - /* Apply the RC4 to the data, update the CRC32 */ - cpos = buf+4; - dpos = buf; - crc = ~0; - i = j = 0; - for (k = 0; k < (len -8); k++) { - i = (i+1) & 0xff; - j = (j+s[i]) & 0xff; - SSWAP(i,j); -#if 0 - printf("%d -- %02x ", k, *dpos); -#endif - *dpos = *cpos++ ^ s[(s[i] + s[j]) & 0xff]; -#if 0 - printf("%02x\n", *dpos); -#endif - crc = crc32_ccitt_table[(crc ^ *dpos++) & 0xff] ^ (crc >> 8); - } - crc = ~crc; - - /* now let's check the crc */ - c_crc[0] = crc; - c_crc[1] = crc >> 8; - c_crc[2] = crc >> 16; - c_crc[3] = crc >> 24; - - for (k = 0; k < 4; k++) { - i = (i + 1) & 0xff; - j = (j+s[i]) & 0xff; - SSWAP(i,j); -#if 0 - printf("-- %02x %02x\n", *dpos, c_crc[k]); -#endif - if ((*cpos++ ^ s[(s[i] + s[j]) & 0xff]) != c_crc[k]) - return -1; /* ICV mismatch */ - } - - return 0; -} -#endif static void init_wepkeys(void) { -#ifndef HAVE_AIRPDCAP - GByteArray *bytes; - gboolean res; - - if (num_wepkeys_uat < 1) - return; - - bytes = g_byte_array_new(); - wep_keys = g_malloc0(num_wepkeys_uat * sizeof(guint8*)); - wep_keylens = g_malloc(num_wepkeys_uat * sizeof(int)); - - for (i = 0, keyidx = 0; keyidx < num_wepkeys_uat && i < MAX_ENCRYPTION_KEYS; i++) { - wep_keys[keyidx] = NULL; - wep_keylens[keyidx] = 0; - - if ((uat_wep_key_records[i].string) && (wep_str_to_bytes(uat_wep_key_records[i].string, bytes) != 0) && (bytes->len > 0)) { - if (bytes->len > 32) { - bytes->len = 32; - } - - wep_keys[keyidx] = g_malloc0(32 * sizeof(guint8)); - memcpy(wep_keys[keyidx], bytes->data, bytes->len * sizeof(guint8)); - wep_keylens[keyidx] = bytes->len; - keyidx++; - } - - g_byte_array_free(bytes, TRUE); - -#else /* HAVE_AIRPDCAP defined */ /* * XXX - AirPDcap - That God sends it to us beautiful (che dio ce la mandi bona) @@ -16196,7 +15964,6 @@ static void init_wepkeys(void) { * already decrypted... One of these days we will fix this too */ set_airpdcap_keys(); -#endif /* HAVE_AIRPDCAP */ } /* * This code had been taken from AirSnort crack.c function classify() diff --git a/gtk/airpcap_dlg.c b/gtk/airpcap_dlg.c index 4f68fb2fb9..fbea665ece 100644 --- a/gtk/airpcap_dlg.c +++ b/gtk/airpcap_dlg.c @@ -844,9 +844,7 @@ on_edit_key_ok_bt_clicked(GtkWidget *widget _U_, gpointer data) gtk_list_store_set(key_list_store, &iter, KL_COL_TYPE, new_type_string->str, KL_COL_KEY, new_key_string->str, -#ifdef HAVE_AIRPDCAP KL_COL_SSID, new_ssid_string->str, -#endif -1); if (airpcap_if_selected != NULL) airpcap_if_selected->saved = FALSE; @@ -885,9 +883,7 @@ on_edit_key_ok_bt_clicked(GtkWidget *widget _U_, gpointer data) gtk_list_store_set(key_list_store, &iter, KL_COL_TYPE, new_type_string->str, KL_COL_KEY, new_key_string->str, -#ifdef HAVE_AIRPDCAP KL_COL_SSID, new_ssid_string->str, -#endif -1); if (airpcap_if_selected != NULL) airpcap_if_selected->saved = FALSE; @@ -926,9 +922,7 @@ on_edit_key_ok_bt_clicked(GtkWidget *widget _U_, gpointer data) gtk_list_store_set(key_list_store, &iter, KL_COL_TYPE, new_type_string->str, KL_COL_KEY, new_key_string->str, -#ifdef HAVE_AIRPDCAP KL_COL_SSID, new_ssid_string->str, -#endif -1); if (airpcap_if_selected != NULL) airpcap_if_selected->saved = FALSE; @@ -1031,10 +1025,8 @@ on_add_new_key_bt_clicked(GtkWidget *button _U_, gpointer data) add_type_cb = gtk_combo_box_new_text(); gtk_combo_box_append_text(GTK_COMBO_BOX(add_type_cb), AIRPCAP_WEP_KEY_STRING); -#ifdef HAVE_AIRPDCAP gtk_combo_box_append_text(GTK_COMBO_BOX(add_type_cb), AIRPCAP_WPA_PWD_KEY_STRING); gtk_combo_box_append_text(GTK_COMBO_BOX(add_type_cb), AIRPCAP_WPA_BIN_KEY_STRING); -#endif gtk_combo_box_set_active(GTK_COMBO_BOX(add_type_cb), 0); gtk_widget_set_name (add_type_cb, "add_type_cb"); gtk_widget_show (add_type_cb); @@ -1216,9 +1208,7 @@ on_edit_key_bt_clicked(GtkWidget *button _U_, gpointer data) gtk_tree_model_get(model, &iter, KL_COL_TYPE, &row_type, KL_COL_KEY, &row_key, -#ifdef HAVE_AIRPDCAP KL_COL_SSID, &row_ssid, -#endif -1); /* Gray out the Advanced Wireless Setting window */ @@ -1255,19 +1245,15 @@ on_edit_key_bt_clicked(GtkWidget *button _U_, gpointer data) edit_type_cb = gtk_combo_box_new_text(); gtk_combo_box_append_text(GTK_COMBO_BOX(edit_type_cb), AIRPCAP_WEP_KEY_STRING); -#ifdef HAVE_AIRPDCAP gtk_combo_box_append_text(GTK_COMBO_BOX(edit_type_cb), AIRPCAP_WPA_PWD_KEY_STRING); gtk_combo_box_append_text(GTK_COMBO_BOX(edit_type_cb), AIRPCAP_WPA_BIN_KEY_STRING); -#endif /* Set current type */ gtk_combo_box_set_active(GTK_COMBO_BOX(edit_type_cb), 0); -#ifdef HAVE_AIRPDCAP if (g_ascii_strcasecmp(row_type, AIRPCAP_WPA_PWD_KEY_STRING) == 0) { gtk_combo_box_set_active(GTK_COMBO_BOX(edit_type_cb), 1); } else if (g_ascii_strcasecmp(row_type, AIRPCAP_WPA_BIN_KEY_STRING) == 0) { gtk_combo_box_set_active(GTK_COMBO_BOX(edit_type_cb), 2); } -#endif gtk_widget_set_name (edit_type_cb, "edit_type_cb"); gtk_widget_show (edit_type_cb); gtk_table_attach (GTK_TABLE (edit_tb), edit_type_cb, 0, 1, 1, 2, @@ -1299,9 +1285,7 @@ on_edit_key_bt_clicked(GtkWidget *button _U_, gpointer data) } /* XXX - Decomment only when WPA and WPA@ will be ready */ -#ifdef HAVE_AIRPDCAP gtk_widget_show (edit_ssid_te); -#endif gtk_table_attach (GTK_TABLE (edit_tb), edit_ssid_te, 2, 3, 1, 2, (GtkAttachOptions) (0), (GtkAttachOptions) (0), 0, 0); @@ -1375,9 +1359,7 @@ on_edit_key_bt_clicked(GtkWidget *button _U_, gpointer data) g_free(row_type); g_free(row_key); -#ifdef HAVE_AIRPDCAP g_free(row_ssid); -#endif gtk_widget_show(edit_key_window); } @@ -2214,9 +2196,7 @@ display_airpcap_key_management_cb(GtkWidget *w _U_, gpointer data) key_list_store = gtk_list_store_new(KL_NUM_COLS, G_TYPE_STRING, /* Type */ G_TYPE_STRING /* Key */ -#ifdef HAVE_AIRPDCAP , G_TYPE_STRING /* SSID */ -#endif ); /* Create a view */ @@ -2261,7 +2241,6 @@ display_airpcap_key_management_cb(GtkWidget *w _U_, gpointer data) gtk_tree_view_column_set_fixed_width(column, 200); gtk_tree_view_append_column(GTK_TREE_VIEW(key_list), column); -#ifdef HAVE_AIRPDCAP /* SSID */ renderer = gtk_cell_renderer_text_new(); column = gtk_tree_view_column_new_with_attributes("SSID", renderer, @@ -2273,7 +2252,6 @@ display_airpcap_key_management_cb(GtkWidget *w _U_, gpointer data) gtk_tree_view_column_set_min_width(column, 80); gtk_tree_view_column_set_fixed_width(column, 150); gtk_tree_view_append_column(GTK_TREE_VIEW(key_list), column); -#endif /* Now enable the sorting of each column */ gtk_tree_view_set_rules_hint(GTK_TREE_VIEW(key_list), TRUE); diff --git a/gtk/airpcap_gui_utils.c b/gtk/airpcap_gui_utils.c index 50d03788e7..5052929fe1 100644 --- a/gtk/airpcap_gui_utils.c +++ b/gtk/airpcap_gui_utils.c @@ -250,11 +250,7 @@ airpcap_set_toolbar_stop_capture(airpcap_if_info_t* if_info) * Add a key (string) to the given list */ void -airpcap_add_key_to_list(GtkListStore *key_list_store, gchar* type, gchar* key, gchar* ssid -#ifndef HAVE_AIRPDCAP - _U_ -#endif - ) +airpcap_add_key_to_list(GtkListStore *key_list_store, gchar* type, gchar* key, gchar* ssid) { GtkTreeIter iter; @@ -266,9 +262,7 @@ airpcap_add_key_to_list(GtkListStore *key_list_store, gchar* type, gchar* key, g #endif KL_COL_TYPE, type, KL_COL_KEY, key, -#ifdef HAVE_AIRPDCAP KL_COL_SSID, ssid, -#endif -1); } @@ -310,9 +304,7 @@ airpcap_fill_key_list(GtkListStore *key_list_store) #endif KL_COL_TYPE, AIRPCAP_WEP_KEY_STRING, KL_COL_KEY, curr_key->key->str, -#ifdef HAVE_AIRPDCAP KL_COL_SSID, "", -#endif -1); } else if(curr_key->type == AIRPDCAP_KEY_TYPE_WPA_PWD) @@ -330,9 +322,7 @@ airpcap_fill_key_list(GtkListStore *key_list_store) #endif KL_COL_TYPE, AIRPCAP_WPA_PWD_KEY_STRING, KL_COL_KEY, curr_key->key->str, -#ifdef HAVE_AIRPDCAP KL_COL_SSID, s, -#endif -1); } @@ -346,9 +336,7 @@ airpcap_fill_key_list(GtkListStore *key_list_store) #endif KL_COL_TYPE, AIRPCAP_WPA_BIN_KEY_STRING, KL_COL_KEY, curr_key->key->str, -#ifdef HAVE_AIRPDCAP KL_COL_SSID, "", -#endif -1); } @@ -855,9 +843,7 @@ airpcap_read_and_save_decryption_keys_from_list_store(GtkListStore* key_list_sto gtk_tree_model_get(model, &iter, KL_COL_TYPE, &tmp_type, KL_COL_KEY, &tmp_key, -#ifdef HAVE_AIRPDCAP KL_COL_SSID, &tmp_ssid, -#endif -1); if(g_ascii_strcasecmp(tmp_type, AIRPCAP_WEP_KEY_STRING) == 0) @@ -889,9 +875,7 @@ airpcap_read_and_save_decryption_keys_from_list_store(GtkListStore* key_list_sto key_list = g_list_append(key_list,tmp_dk); } g_free(tmp_type); -#ifdef HAVE_AIRPDCAP g_free(tmp_ssid); -#endif } r = save_wlan_wireshark_wep_keys(key_list); diff --git a/gtk/airpcap_gui_utils.h b/gtk/airpcap_gui_utils.h index a27ea032fe..fb84a25d66 100644 --- a/gtk/airpcap_gui_utils.h +++ b/gtk/airpcap_gui_utils.h @@ -52,9 +52,7 @@ enum { KL_COL_TYPE, KL_COL_KEY, -#ifdef HAVE_AIRPDCAP KL_COL_SSID, -#endif KL_NUM_COLS }; diff --git a/gtk/main.c b/gtk/main.c index 28e11e4104..717bb13a03 100644 --- a/gtk/main.c +++ b/gtk/main.c @@ -178,9 +178,7 @@ #include "airpcap_gui_utils.h" #endif -#ifdef HAVE_AIRPDCAP #include -#endif #ifdef HAVE_GTKOSXAPPLICATION @@ -2083,9 +2081,7 @@ main(int argc, char *argv[]) /* initialize the funnel mini-api */ initialize_funnel_ops(); -#ifdef HAVE_AIRPDCAP AirPDcapInitContext(&airpdcap_ctx); -#endif #ifdef _WIN32 /* Load wpcap if possible. Do this before collecting the run-time version information */ @@ -2989,9 +2985,7 @@ main(int argc, char *argv[]) epan_cleanup(); -#ifdef HAVE_AIRPDCAP - AirPDcapDestroyContext(&airpdcap_ctx); -#endif + AirPDcapDestroyContext(&airpdcap_ctx); #ifdef _WIN32 /* hide the (unresponsive) main window, while asking the user to close the console window */ diff --git a/gtk/main_airpcap_toolbar.c b/gtk/main_airpcap_toolbar.c index 1abf152012..ff6256d5d3 100644 --- a/gtk/main_airpcap_toolbar.c +++ b/gtk/main_airpcap_toolbar.c @@ -49,9 +49,7 @@ #include "airpcap_dlg.h" #include "airpcap_gui_utils.h" -#ifdef HAVE_AIRPDCAP #include -#endif gboolean block_toolbar_signals = FALSE;