Index: uspace/lib/ieee80211/include/ieee80211.h =================================================================== --- uspace/lib/ieee80211/include/ieee80211.h (revision 1b20da07baaa3e3c424f62c927274e676e4295cd) +++ uspace/lib/ieee80211/include/ieee80211.h (revision 8565a42398543d14e36b2df6f7a70c6237b458f8) @@ -107,5 +107,5 @@ */ errno_t (*start)(struct ieee80211_dev *); - + /** Scan neighborhood for networks. * @@ -119,5 +119,5 @@ */ errno_t (*scan)(struct ieee80211_dev *); - + /** Handler for TX frames to be send from device. * @@ -133,5 +133,5 @@ */ errno_t (*tx_handler)(struct ieee80211_dev *, void *, size_t); - + /** Set device operating frequency to given value. * @@ -143,5 +143,5 @@ */ errno_t (*set_freq)(struct ieee80211_dev *, uint16_t); - + /** Callback to inform device about BSSID change. * @@ -153,5 +153,5 @@ */ errno_t (*bssid_change)(struct ieee80211_dev *, bool); - + /** Callback to setup encryption key in IEEE 802.11 device. * Index: uspace/lib/ieee80211/include/ieee80211_private.h =================================================================== --- uspace/lib/ieee80211/include/ieee80211_private.h (revision 1b20da07baaa3e3c424f62c927274e676e4295cd) +++ uspace/lib/ieee80211/include/ieee80211_private.h (revision 8565a42398543d14e36b2df6f7a70c6237b458f8) @@ -231,23 +231,23 @@ /** Backing DDF device. */ ddf_dev_t *ddf_dev; - + /** Pointer to implemented IEEE 802.11 device operations. */ ieee80211_ops_t *ops; - + /** Pointer to implemented IEEE 802.11 interface operations. */ ieee80211_iface_t *iface; - + /** Pointer to driver specific data. */ void *specific; - + /** Current operating frequency. */ uint16_t current_freq; - + /** Current operating mode. */ ieee80211_operating_mode_t current_op_mode; - + /** Info about BSSID we are connected to. */ ieee80211_bssid_info_t bssid_info; - + /** * Flag indicating that data traffic is encrypted by HW key @@ -255,32 +255,32 @@ */ bool using_hw_key; - + /** BSSIDs we listen to. */ nic_address_t bssid_mask; - + /** List of APs in neighborhood. */ ieee80211_scan_result_list_t ap_list; - + /** Current sequence number used in data frames. */ uint16_t sequence_number; - + /** Current authentication phase. */ ieee80211_auth_phase_t current_auth_phase; - + /** Flag indicating whether client wants connect to network. */ bool pending_conn_req; - + /** Scanning guard. */ fibril_mutex_t scan_mutex; - + /** General purpose guard. */ fibril_mutex_t gen_mutex; - + /** General purpose condition variable. */ fibril_condvar_t gen_cond; - + /** Indicates whether device is fully initialized. */ bool ready; - + /** Indicates whether driver has already started. */ bool started; Index: uspace/lib/ieee80211/src/ieee80211.c =================================================================== --- uspace/lib/ieee80211/src/ieee80211.c (revision 1b20da07baaa3e3c424f62c927274e676e4295cd) +++ uspace/lib/ieee80211/src/ieee80211.c (revision 8565a42398543d14e36b2df6f7a70c6237b458f8) @@ -72,5 +72,5 @@ { frame_ctrl = uint16_t_le2host(frame_ctrl); - + return (frame_ctrl & IEEE80211_FRAME_CTRL_FRAME_TYPE) == IEEE80211_DATA_FRAME; @@ -87,5 +87,5 @@ { frame_ctrl = uint16_t_le2host(frame_ctrl); - + return (frame_ctrl & IEEE80211_FRAME_CTRL_FRAME_TYPE) == IEEE80211_MGMT_FRAME; @@ -102,5 +102,5 @@ { frame_ctrl = uint16_t_le2host(frame_ctrl); - + return (frame_ctrl & IEEE80211_FRAME_CTRL_FRAME_SUBTYPE) == IEEE80211_MGMT_BEACON_FRAME; @@ -117,5 +117,5 @@ { frame_ctrl = uint16_t_le2host(frame_ctrl); - + return (frame_ctrl & IEEE80211_FRAME_CTRL_FRAME_SUBTYPE) == IEEE80211_MGMT_PROBE_RESP_FRAME; @@ -132,5 +132,5 @@ { frame_ctrl = uint16_t_le2host(frame_ctrl); - + return (frame_ctrl & IEEE80211_FRAME_CTRL_FRAME_SUBTYPE) == IEEE80211_MGMT_AUTH_FRAME; @@ -147,5 +147,5 @@ { frame_ctrl = uint16_t_le2host(frame_ctrl); - + return (frame_ctrl & IEEE80211_FRAME_CTRL_FRAME_SUBTYPE) == IEEE80211_MGMT_ASSOC_RESP_FRAME; @@ -162,5 +162,5 @@ { frame_ctrl = uint16_t_le2host(frame_ctrl); - + return (frame_ctrl & IEEE80211_FRAME_CTRL_TODS); } @@ -176,5 +176,5 @@ { frame_ctrl = uint16_t_le2host(frame_ctrl); - + return (frame_ctrl & IEEE80211_FRAME_CTRL_FROMDS); } @@ -190,5 +190,5 @@ { frame_ctrl = uint16_t_le2host(frame_ctrl); - + return (frame_ctrl & (IEEE80211_FRAME_CTRL_FRAME_TYPE | 0x40)) == IEEE80211_DATA_FRAME; @@ -205,5 +205,5 @@ { frame_ctrl = uint16_t_le2host(frame_ctrl); - + return (frame_ctrl & IEEE80211_FRAME_CTRL_PROTECTED); } @@ -233,5 +233,5 @@ uint16_t ret_val = ieee80211_dev->sequence_number; ieee80211_dev->sequence_number += (1 << 4); - + return ret_val; } @@ -286,5 +286,5 @@ ieee80211_operating_mode_t op_mode = ieee80211_dev->current_op_mode; fibril_mutex_unlock(&ieee80211_dev->gen_mutex); - + return op_mode; } @@ -302,5 +302,5 @@ uint16_t current_freq = ieee80211_dev->current_freq; fibril_mutex_unlock(&ieee80211_dev->gen_mutex); - + return current_freq; } @@ -318,9 +318,9 @@ { fibril_mutex_lock(&ieee80211_dev->gen_mutex); - + if (bssid) { ieee80211_scan_result_link_t *res_link = ieee80211_dev->bssid_info.res_link; - + if (res_link) { memcpy(bssid, &res_link->scan_result.bssid, @@ -333,5 +333,5 @@ } } - + fibril_mutex_unlock(&ieee80211_dev->gen_mutex); } @@ -349,5 +349,5 @@ uint16_t aid = ieee80211_dev->bssid_info.aid; fibril_mutex_unlock(&ieee80211_dev->gen_mutex); - + return aid; } @@ -367,5 +367,5 @@ int suite = auth_link->scan_result.security.pair_alg; fibril_mutex_unlock(&ieee80211_dev->gen_mutex); - + return suite; } @@ -384,5 +384,5 @@ ieee80211_dev->current_auth_phase == IEEE80211_AUTH_CONNECTED; fibril_mutex_unlock(&ieee80211_dev->gen_mutex); - + return conn_state; } @@ -401,5 +401,5 @@ ieee80211_auth_phase_t conn_state = ieee80211_dev->current_auth_phase; fibril_mutex_unlock(&ieee80211_dev->gen_mutex); - + return conn_state; } @@ -418,5 +418,5 @@ ieee80211_dev->pending_conn_req = false; fibril_mutex_unlock(&ieee80211_dev->gen_mutex); - + return conn_request; } @@ -462,5 +462,5 @@ bool ready_state = ieee80211_dev->ready; fibril_mutex_unlock(&ieee80211_dev->gen_mutex); - + return ready_state; } @@ -484,5 +484,5 @@ bool using_key = ieee80211_dev->using_hw_key; fibril_mutex_unlock(&ieee80211_dev->gen_mutex); - + return using_key; } @@ -499,12 +499,12 @@ { assert(arg); - + ieee80211_dev_t *ieee80211_dev = (ieee80211_dev_t *) arg; - + while (true) { ieee80211_dev->ops->scan(ieee80211_dev); async_usleep(SCAN_PERIOD_USEC); } - + return EOK; } @@ -521,21 +521,21 @@ nic_t *nic_data = nic_get_from_ddf_fun(fun); ieee80211_dev_t *ieee80211_dev = nic_get_specific(nic_data); - + if (ieee80211_dev->started) return EOK; - + ieee80211_dev->started = true; - + errno_t rc = ieee80211_dev->ops->start(ieee80211_dev); if (rc != EOK) return rc; - + /* Add scanning fibril. */ fid_t fibril = fibril_create(ieee80211_scan, ieee80211_dev); if (fibril == 0) return ENOMEM; - + fibril_add_ready(fibril); - + return EOK; } @@ -552,5 +552,5 @@ ieee80211_dev_t *ieee80211_dev = (ieee80211_dev_t *) nic_get_specific(nic); - + ieee80211_auth_phase_t auth_phase = ieee80211_get_auth_phase(ieee80211_dev); @@ -558,15 +558,15 @@ (auth_phase != IEEE80211_AUTH_CONNECTED)) return; - + ieee80211_scan_result_t *auth_data = &ieee80211_dev->bssid_info.res_link->scan_result; - + /* We drop part of IEEE 802.3 ethernet header. */ size_t drop_bytes = sizeof(eth_header_t) - 2; - + size_t complete_size = (size - drop_bytes) + sizeof(ieee80211_data_header_t) + ARRAY_SIZE(rfc1042_header); - + /* Init crypto data. */ bool add_mic = false; @@ -575,5 +575,5 @@ uint8_t head_data[head_space]; memset(head_data, 0, head_space); - + // TODO: Distinguish used key (pair/group) by dest address ? if (ieee80211_query_using_key(ieee80211_dev)) { @@ -592,27 +592,27 @@ break; } - + crypto = uint16_t_le2host(IEEE80211_FRAME_CTRL_PROTECTED); } - + complete_size += head_space + mic_space; - + void *complete_buffer = malloc(complete_size); if (!complete_buffer) return; - + memset(complete_buffer, 0, complete_size); - + if (head_space) memcpy(complete_buffer + sizeof(ieee80211_data_header_t), head_data, head_space); - + memcpy(complete_buffer + sizeof(ieee80211_data_header_t) + head_space, rfc1042_header, ARRAY_SIZE(rfc1042_header)); - + memcpy(complete_buffer + sizeof(ieee80211_data_header_t) + ARRAY_SIZE(rfc1042_header) + head_space, data + drop_bytes, size - drop_bytes); - + ieee80211_data_header_t *data_header = (ieee80211_data_header_t *) complete_buffer; @@ -623,10 +623,10 @@ crypto; data_header->seq_ctrl = ieee80211_get_sequence_number(ieee80211_dev); - + /* BSSID, SA, DA. */ memcpy(data_header->address1, auth_data->bssid.address, ETH_ADDR); memcpy(data_header->address2, data + ETH_ADDR, ETH_ADDR); memcpy(data_header->address3, data, ETH_ADDR); - + if (add_mic) { size_t size_wo_mic = complete_size - MIC_LENGTH; @@ -636,8 +636,8 @@ complete_buffer + size_wo_mic); } - + ieee80211_dev->ops->tx_handler(ieee80211_dev, complete_buffer, complete_size); - + free(complete_buffer); } @@ -662,24 +662,24 @@ if (!ieee80211_ops->start) ieee80211_ops->start = ieee80211_start_impl; - + if (!ieee80211_ops->tx_handler) ieee80211_ops->tx_handler = ieee80211_tx_handler_impl; - + if (!ieee80211_ops->set_freq) ieee80211_ops->set_freq = ieee80211_set_freq_impl; - + if (!ieee80211_ops->bssid_change) ieee80211_ops->bssid_change = ieee80211_bssid_change_impl; - + if (!ieee80211_ops->key_config) ieee80211_ops->key_config = ieee80211_key_config_impl; - + if (!ieee80211_ops->scan) ieee80211_ops->scan = ieee80211_scan_impl; } else return EINVAL; - + ieee80211_dev->ops = ieee80211_ops; - + if (ieee80211_iface) { if (nic_dev_ops) @@ -687,17 +687,17 @@ nic_dev_ops->interfaces[IEEE80211_DEV_IFACE] = ieee80211_iface; - + if (!ieee80211_iface->get_scan_results) ieee80211_iface->get_scan_results = ieee80211_get_scan_results_impl; - + if (!ieee80211_iface->connect) ieee80211_iface->connect = ieee80211_connect_impl; - + if (!ieee80211_iface->disconnect) ieee80211_iface->disconnect = ieee80211_disconnect_impl; } else return EINVAL; - + if (nic_dev_ops) { if (!nic_dev_ops->open) @@ -705,9 +705,9 @@ } else return EINVAL; - + ieee80211_dev->iface = ieee80211_iface; - + nic_driver_implement(NULL, nic_dev_ops, nic_iface); - + return EOK; } @@ -740,21 +740,21 @@ ieee80211_dev->current_op_mode = IEEE80211_OPMODE_STATION; ieee80211_dev->current_auth_phase = IEEE80211_AUTH_DISCONNECTED; - + memcpy(ieee80211_dev->bssid_mask.address, ieee80211_broadcast_mac_addr, ETH_ADDR); - + ieee80211_scan_result_list_init(&ieee80211_dev->ap_list); - + fibril_mutex_initialize(&ieee80211_dev->scan_mutex); fibril_mutex_initialize(&ieee80211_dev->gen_mutex); fibril_condvar_initialize(&ieee80211_dev->gen_cond); - + /* Bind NIC to device */ nic_t *nic = nic_create_and_bind(ddf_dev); if (!nic) return ENOMEM; - + nic_set_specific(nic, ieee80211_dev); - + return EOK; } @@ -780,18 +780,18 @@ if (rc != EOK) return rc; - + nic_t *nic = nic_get_from_ddf_dev(ieee80211_dev->ddf_dev); - + /* TODO: Set NIC handlers here. */ nic_set_send_frame_handler(nic, ieee80211_send_frame); - + ddf_fun_t *fun = ddf_fun_create(ieee80211_dev->ddf_dev, fun_exposed, "port0"); if (fun == NULL) return EINVAL; - + nic_set_ddf_fun(nic, fun); ddf_fun_set_ops(fun, ieee80211_nic_dev_ops); - + rc = ddf_fun_bind(fun); if (rc != EOK) { @@ -799,5 +799,5 @@ return rc; } - + rc = ddf_fun_add_to_category(fun, DEVICE_CATEGORY_NIC); if (rc != EOK) { @@ -805,5 +805,5 @@ return rc; } - + rc = ddf_fun_add_to_category(fun, DEVICE_CATEGORY_IEEE80211); if (rc != EOK) { @@ -811,5 +811,5 @@ return rc; } - + return EOK; } @@ -832,10 +832,10 @@ ieee80211_ie_header_t *header = (ieee80211_ie_header_t *) *ie_header; - + header->element_id = id; header->length = length; - + memcpy(*ie_header + sizeof(ieee80211_ie_header_t), data, length); - + *ie_header = (void *) ((void *) header + sizeof(ieee80211_ie_header_t) + length); @@ -855,11 +855,11 @@ nic_address_t nic_address; nic_query_address(nic, &nic_address); - + size_t ssid_data_size = (ssid != NULL) ? str_size(ssid) : 0; size_t channel_data_size = 1; - + uint8_t channel = ieee80211_freq_to_channel(ieee80211_dev->current_freq); - + /* * 4 headers - (ssid, rates, ext rates, current channel) @@ -871,15 +871,15 @@ IEEE80211_DATA_RATES_SIZE + IEEE80211_EXT_DATA_RATES_SIZE + channel_data_size; - + size_t buffer_size = sizeof(ieee80211_mgmt_header_t) + payload_size; void *buffer = malloc(buffer_size); if (!buffer) return ENOMEM; - + memset(buffer, 0, buffer_size); - + ieee80211_mgmt_header_t *mgmt_header = (ieee80211_mgmt_header_t *) buffer; - + mgmt_header->frame_ctrl = host2uint16_t_le(IEEE80211_MGMT_FRAME | @@ -890,5 +890,5 @@ mgmt_header->seq_ctrl = host2uint16_t_le(ieee80211_get_sequence_number(ieee80211_dev)); - + /* Jump to payload. */ void *it = (void *) buffer + sizeof(ieee80211_mgmt_header_t); @@ -902,9 +902,9 @@ ieee80211_prepare_ie_header(&it, IEEE80211_CHANNEL_IE, channel_data_size, (void *) &channel); - + ieee80211_dev->ops->tx_handler(ieee80211_dev, buffer, buffer_size); - + free(buffer); - + return EOK; } @@ -922,20 +922,20 @@ nic_address_t nic_address; nic_query_address(nic, &nic_address); - + ieee80211_scan_result_t *auth_data = &ieee80211_dev->bssid_info.res_link->scan_result; - + size_t buffer_size = sizeof(ieee80211_mgmt_header_t) + sizeof(ieee80211_auth_body_t); - + void *buffer = malloc(buffer_size); if (!buffer) return ENOMEM; - + memset(buffer, 0, buffer_size); - + ieee80211_mgmt_header_t *mgmt_header = (ieee80211_mgmt_header_t *) buffer; - + mgmt_header->frame_ctrl = host2uint16_t_le(IEEE80211_MGMT_FRAME | @@ -944,5 +944,5 @@ memcpy(mgmt_header->src_addr, nic_address.address, ETH_ADDR); memcpy(mgmt_header->bssid, auth_data->bssid.address, ETH_ADDR); - + ieee80211_auth_body_t *auth_body = (ieee80211_auth_body_t *) @@ -950,9 +950,9 @@ auth_body->auth_alg = host2uint16_t_le(0); auth_body->auth_trans_no = host2uint16_t_le(1); - + ieee80211_dev->ops->tx_handler(ieee80211_dev, buffer, buffer_size); - + free(buffer); - + return EOK; } @@ -972,12 +972,12 @@ nic_address_t nic_address; nic_query_address(nic, &nic_address); - + ieee80211_scan_result_link_t *auth_link = ieee80211_dev->bssid_info.res_link; - + ieee80211_scan_result_t *auth_data = &auth_link->scan_result; - + size_t ssid_data_size = str_size(auth_data->ssid); - + size_t payload_size = sizeof(ieee80211_ie_header_t) * 3 + @@ -985,23 +985,23 @@ IEEE80211_DATA_RATES_SIZE + IEEE80211_EXT_DATA_RATES_SIZE; - + size_t buffer_size = sizeof(ieee80211_mgmt_header_t) + sizeof(ieee80211_assoc_req_body_t) + payload_size; - + if ((auth_data->security.type == IEEE80211_SECURITY_WPA) || (auth_data->security.type == IEEE80211_SECURITY_WPA2)) buffer_size += auth_link->auth_ie_len; - + void *buffer = malloc(buffer_size); if (!buffer) return ENOMEM; - + memset(buffer, 0, buffer_size); - + ieee80211_mgmt_header_t *mgmt_header = (ieee80211_mgmt_header_t *) buffer; - + mgmt_header->frame_ctrl = host2uint16_t_le(IEEE80211_MGMT_FRAME | @@ -1010,10 +1010,10 @@ memcpy(mgmt_header->src_addr, nic_address.address, ETH_ADDR); memcpy(mgmt_header->bssid, auth_data->bssid.address, ETH_ADDR); - + ieee80211_assoc_req_body_t *assoc_body = (ieee80211_assoc_req_body_t *) (buffer + sizeof(ieee80211_mgmt_header_t)); assoc_body->listen_interval = host2uint16_t_le(1); - + /* Jump to payload. */ void *it = buffer + sizeof(ieee80211_mgmt_header_t) + @@ -1026,14 +1026,14 @@ IEEE80211_EXT_DATA_RATES_SIZE, (void *) &ieee80211bg_data_rates[IEEE80211_DATA_RATES_SIZE]); - + if (auth_data->security.type != IEEE80211_SECURITY_OPEN) assoc_body->capability |= host2uint16_t_le(CAP_SECURITY); - + if ((auth_data->security.type == IEEE80211_SECURITY_WPA) || (auth_data->security.type == IEEE80211_SECURITY_WPA2)) memcpy(it, auth_link->auth_ie, auth_link->auth_ie_len); - + ieee80211_dev->ops->tx_handler(ieee80211_dev, buffer, buffer_size); - + /* * Save password to be used in eventual authentication handshake. @@ -1042,7 +1042,7 @@ memcpy(ieee80211_dev->bssid_info.password, password, str_size(password)); - + free(buffer); - + return EOK; } @@ -1061,21 +1061,21 @@ ieee80211_scan_result_t *auth_data = &ieee80211_dev->bssid_info.res_link->scan_result; - + nic_t *nic = nic_get_from_ddf_dev(ieee80211_dev->ddf_dev); nic_address_t nic_address; nic_query_address(nic, &nic_address); - + size_t buffer_size = sizeof(ieee80211_mgmt_header_t) + sizeof(ieee80211_deauth_body_t); - + void *buffer = malloc(buffer_size); if (!buffer) return ENOMEM; - + memset(buffer, 0, buffer_size); - + ieee80211_mgmt_header_t *mgmt_header = (ieee80211_mgmt_header_t *) buffer; - + mgmt_header->frame_ctrl = host2uint16_t_le(IEEE80211_MGMT_FRAME | @@ -1084,17 +1084,17 @@ memcpy(mgmt_header->src_addr, nic_address.address, ETH_ADDR); memcpy(mgmt_header->bssid, auth_data->bssid.address, ETH_ADDR); - + ieee80211_dev->ops->tx_handler(ieee80211_dev, buffer, buffer_size); - + free(buffer); - + ieee80211_dev->bssid_info.res_link = NULL; ieee80211_dev->ops->bssid_change(ieee80211_dev, false); - + if (ieee80211_query_using_key(ieee80211_dev)) ieee80211_dev->ops->key_config(ieee80211_dev, NULL, false); - + ieee80211_set_auth_phase(ieee80211_dev, IEEE80211_AUTH_DISCONNECTED); - + return EOK; } @@ -1104,5 +1104,5 @@ { uint8_t *it = (uint8_t *) buffer; - + uint16_t *version = (uint16_t *) it; if (uint16_t_le2host(*version) != 0x1) { @@ -1110,7 +1110,7 @@ return; } - + it += sizeof(uint16_t); - + uint32_t group_cipher = *(it + 3); switch (group_cipher) { @@ -1126,7 +1126,7 @@ ap_data->scan_result.security.group_alg = -1; } - + it += 4 * sizeof(uint8_t); - + uint16_t *pairwise_count = (uint16_t *) it; uint32_t pairwise_cipher = *(it + sizeof(uint16_t) + 3); @@ -1143,8 +1143,8 @@ ap_data->scan_result.security.pair_alg = -1; } - + it += 2 * sizeof(uint16_t) + uint16_t_le2host(*pairwise_count) * sizeof(uint32_t); - + uint32_t auth_suite = *(it + 3); switch (auth_suite) { @@ -1167,5 +1167,5 @@ ap_data->auth_ie_len = ie_header->length + sizeof(ieee80211_ie_header_t); - + memcpy(ap_data->auth_ie, it, ap_data->auth_ie_len); } @@ -1180,10 +1180,10 @@ uint8_t *channel; uint32_t oui; - + switch (ie_header->element_id) { case IEEE80211_CHANNEL_IE: if (!ap_data) break; - + channel = (uint8_t *) (it + sizeof(ieee80211_ie_header_t)); @@ -1193,5 +1193,5 @@ if (!ap_data) break; - + ap_data->scan_result.security.type = IEEE80211_SECURITY_WPA2; @@ -1203,17 +1203,17 @@ oui = uint32be_from_seq(it + sizeof(ieee80211_ie_header_t)); - + if (oui == WPA_OUI) { if (!ap_data) break; - + /* Prefering WPA2. */ if (ap_data->scan_result.security.type == IEEE80211_SECURITY_WPA2) break; - + ap_data->scan_result.security.type = IEEE80211_SECURITY_WPA; - + ieee80211_process_auth_info(ap_data, it + sizeof(ieee80211_ie_header_t) + @@ -1226,8 +1226,8 @@ } } - + it += sizeof(ieee80211_ie_header_t) + ie_header->length; } - + return NULL; } @@ -1246,20 +1246,20 @@ ieee80211_beacon_start_t *beacon_body = (ieee80211_beacon_start_t *) ((void *) mgmt_header + sizeof(ieee80211_mgmt_header_t)); - + ieee80211_ie_header_t *ssid_ie_header = (ieee80211_ie_header_t *) ((void *) beacon_body + sizeof(ieee80211_beacon_start_t)); - + /* Not empty SSID. */ if (ssid_ie_header->length > 0) { ieee80211_scan_result_list_t *result_list = &ieee80211_dev->ap_list; - + uint8_t *ssid_start = (uint8_t *) ((void *) ssid_ie_header + sizeof(ieee80211_ie_header_t)); char ssid[IEEE80211_MAX_SSID_LENGTH]; - + memcpy(ssid, ssid_start, ssid_ie_header->length); ssid[ssid_ie_header->length] = '\0'; - + /* Check whether SSID is already in results. */ ieee80211_scan_result_list_foreach(*result_list, result) { @@ -1269,22 +1269,22 @@ } } - + /* Results are full. */ if (result_list->size == IEEE80211_MAX_RESULTS_LENGTH - 1) return EOK; - + ieee80211_scan_result_link_t *ap_data = malloc(sizeof(ieee80211_scan_result_link_t)); if (!ap_data) return ENOMEM; - + memset(ap_data, 0, sizeof(ieee80211_scan_result_link_t)); link_initialize(&ap_data->link); - + memcpy(ap_data->scan_result.bssid.address, mgmt_header->bssid, ETH_ADDR); memcpy(ap_data->scan_result.ssid, ssid, ssid_ie_header->length + 1); - + if (uint16_t_le2host(beacon_body->capability) & CAP_SECURITY) { ap_data->scan_result.security.type = @@ -1297,5 +1297,5 @@ ap_data->scan_result.security.group_alg = -1; } - + void *rest_ies_start = ssid_start + ssid_ie_header->length; size_t rest_buffer_size = @@ -1305,15 +1305,15 @@ sizeof(ieee80211_ie_header_t) - ssid_ie_header->length; - + ieee80211_process_ies(ieee80211_dev, ap_data, rest_ies_start, rest_buffer_size); - + ap_data->last_beacon = time(NULL); - + fibril_mutex_lock(&ieee80211_dev->ap_list.results_mutex); ieee80211_scan_result_list_append(result_list, ap_data); fibril_mutex_unlock(&ieee80211_dev->ap_list.results_mutex); } - + return EOK; } @@ -1333,5 +1333,5 @@ (ieee80211_auth_body_t *) ((void *) mgmt_header + sizeof(ieee80211_mgmt_header_t)); - + if (auth_body->status != 0) ieee80211_set_auth_phase(ieee80211_dev, @@ -1340,9 +1340,9 @@ ieee80211_set_auth_phase(ieee80211_dev, IEEE80211_AUTH_AUTHENTICATED); - + fibril_mutex_lock(&ieee80211_dev->gen_mutex); fibril_condvar_signal(&ieee80211_dev->gen_cond); fibril_mutex_unlock(&ieee80211_dev->gen_mutex); - + return EOK; } @@ -1362,5 +1362,5 @@ (ieee80211_assoc_resp_body_t *) ((void *) mgmt_header + sizeof(ieee80211_mgmt_header_t)); - + if (assoc_resp->status != 0) ieee80211_set_auth_phase(ieee80211_dev, @@ -1373,9 +1373,9 @@ ieee80211_dev->ops->bssid_change(ieee80211_dev, true); } - + fibril_mutex_lock(&ieee80211_dev->gen_mutex); fibril_condvar_signal(&ieee80211_dev->gen_cond); fibril_mutex_unlock(&ieee80211_dev->gen_mutex); - + return EOK; } @@ -1386,35 +1386,35 @@ ieee80211_eapol_key_frame_t *key_frame = (ieee80211_eapol_key_frame_t *) buffer; - + ieee80211_scan_result_link_t *auth_link = ieee80211_dev->bssid_info.res_link; - + ieee80211_scan_result_t *auth_data = &auth_link->scan_result; - + /* We don't support 802.1X authentication yet. */ if (auth_data->security.auth == IEEE80211_AUTH_AKM_8021X) return ENOTSUP; - + uint8_t *ptk = ieee80211_dev->bssid_info.ptk; uint8_t *gtk = ieee80211_dev->bssid_info.gtk; uint8_t gtk_id = 1; - + bool handshake_done = false; - + bool old_wpa = auth_data->security.type == IEEE80211_SECURITY_WPA; - + bool key_phase = uint16_t_be2host(key_frame->key_info) & IEEE80211_EAPOL_KEY_KEYINFO_MIC; - + bool final_phase = uint16_t_be2host(key_frame->key_info) & IEEE80211_EAPOL_KEY_KEYINFO_SECURE; - + bool ccmp_used = (auth_data->security.pair_alg == IEEE80211_SECURITY_SUITE_CCMP) || (auth_data->security.group_alg == IEEE80211_SECURITY_SUITE_CCMP); - + size_t ptk_key_length, gtk_key_length; hash_func_t mic_hash; @@ -1423,33 +1423,33 @@ else mic_hash = HASH_MD5; - + if (auth_data->security.pair_alg == IEEE80211_SECURITY_SUITE_CCMP) ptk_key_length = IEEE80211_PTK_CCMP_LENGTH; else ptk_key_length = IEEE80211_PTK_TKIP_LENGTH; - + if (auth_data->security.group_alg == IEEE80211_SECURITY_SUITE_CCMP) gtk_key_length = IEEE80211_GTK_CCMP_LENGTH; else gtk_key_length = IEEE80211_GTK_TKIP_LENGTH; - + size_t output_size = sizeof(eth_header_t) + sizeof(ieee80211_eapol_key_frame_t); - + if (!(uint16_t_be2host(key_frame->key_info) & IEEE80211_EAPOL_KEY_KEYINFO_MIC)) output_size += auth_link->auth_ie_len; - + nic_t *nic = nic_get_from_ddf_dev(ieee80211_dev->ddf_dev); nic_address_t nic_address; nic_query_address(nic, &nic_address); - + void *output_buffer = malloc(output_size); if (!output_buffer) return ENOMEM; - + memset(output_buffer, 0, output_size); - + /* Setup ethernet header. */ eth_header_t *eth_header = (eth_header_t *) output_buffer; @@ -1457,13 +1457,13 @@ memcpy(eth_header->src_addr, nic_address.address, ETH_ADDR); eth_header->proto = host2uint16_t_be(ETH_TYPE_PAE); - + ieee80211_eapol_key_frame_t *output_key_frame = (ieee80211_eapol_key_frame_t *) (output_buffer + sizeof(eth_header_t)); - + /* Copy content of incoming EAPOL-Key frame. */ memcpy((void *) output_key_frame, buffer, sizeof(ieee80211_eapol_key_frame_t)); - + output_key_frame->proto_version = 0x1; output_key_frame->body_length = @@ -1471,5 +1471,5 @@ output_key_frame->key_info &= ~host2uint16_t_be(IEEE80211_EAPOL_KEY_KEYINFO_ACK); - + if (key_phase) { output_key_frame->key_info &= @@ -1482,5 +1482,5 @@ memset(output_key_frame->key_rsc, 0, 8); memset(output_key_frame->eapol_key_iv, 0, 16); - + /* Derive GTK and save it. */ if (final_phase) { @@ -1490,8 +1490,8 @@ uint8_t *data_ptr = (uint8_t *) (buffer + sizeof(ieee80211_eapol_key_frame_t)); - + errno_t rc; uint8_t work_key[32]; - + if (ccmp_used) { rc = ieee80211_aes_key_unwrap(ptk + KEK_OFFSET, @@ -1503,13 +1503,13 @@ data_ptr, key_data_length, key_data); } - + if (rc == EOK) { uint8_t *key_data_ptr = old_wpa ? key_data : ieee80211_process_ies(ieee80211_dev, NULL, key_data, key_data_length); - + if (key_data_ptr) { uint8_t *key_ptr; - + if (old_wpa) key_ptr = key_data_ptr; @@ -1518,5 +1518,5 @@ key_ptr = key_data_ptr + 2; } - + memcpy(gtk, key_ptr, gtk_key_length); handshake_done = true; @@ -1532,5 +1532,5 @@ sizeof(ieee80211_eapol_key_frame_t), auth_link->auth_ie, auth_link->auth_ie_len); - + /* Compute PMK. */ uint8_t pmk[PBKDF2_KEY_LENGTH]; @@ -1539,16 +1539,16 @@ (uint8_t *) auth_data->ssid, str_size(auth_data->ssid), pmk); - + uint8_t *anonce = key_frame->key_nonce; - + /* Generate SNONCE. */ uint8_t snonce[32]; rnd_sequence(snonce, 32); - + memcpy(output_key_frame->key_nonce, snonce, 32); - + uint8_t *dest_addr = eth_header->dest_addr; uint8_t *src_addr = eth_header->src_addr; - + /* Derive PTK and save it. */ uint8_t crypt_data[PRF_CRYPT_DATA_LENGTH]; @@ -1563,18 +1563,18 @@ ieee80211_prf(pmk, crypt_data, ptk, ptk_key_length); } - + /* Compute MIC of key frame data from KCK part of PTK. */ uint8_t mic[mic_hash]; hmac(ptk, 16, (uint8_t *) output_key_frame, output_size - sizeof(eth_header_t), mic, mic_hash); - + memcpy(output_key_frame->key_mic, mic, 16); - + ieee80211_send_frame(nic, output_buffer, output_size); - + free(output_buffer); - + ieee80211_key_config_t key_config; - + /* Insert Pairwise key. */ if ((key_phase && old_wpa) || (final_phase && !old_wpa)) { @@ -1584,9 +1584,9 @@ memcpy(key_config.data, ptk + TK_OFFSET, ptk_key_length - TK_OFFSET); - + ieee80211_dev->ops->key_config(ieee80211_dev, &key_config, true); } - + /* Insert Group key. */ if (final_phase) { @@ -1595,9 +1595,9 @@ key_config.flags = IEEE80211_KEY_FLAG_TYPE_GROUP; memcpy(key_config.data, gtk, gtk_key_length); - + ieee80211_dev->ops->key_config(ieee80211_dev, &key_config, true); } - + /* Signal successful handshake completion. */ if (handshake_done) { @@ -1606,5 +1606,5 @@ fibril_mutex_unlock(&ieee80211_dev->gen_mutex); } - + return EOK; } @@ -1615,9 +1615,9 @@ ieee80211_eapol_key_frame_t *key_frame = (ieee80211_eapol_key_frame_t *) buffer; - + if (ieee80211_is_eapol_key_frame(key_frame)) return ieee80211_process_4way_handshake(ieee80211_dev, buffer, buffer_size); - + return EOK; } @@ -1637,10 +1637,10 @@ ieee80211_data_header_t *data_header = (ieee80211_data_header_t *) buffer; - + if (ieee80211_has_data_frame(data_header->frame_ctrl)) { nic_t *nic = nic_get_from_ddf_dev(ieee80211_dev->ddf_dev); size_t strip_length = sizeof(ieee80211_data_header_t) + ARRAY_SIZE(rfc1042_header); - + /* TODO: Different by used security alg. */ /* TODO: Trim frame by used security alg. */ @@ -1648,5 +1648,5 @@ if (ieee80211_is_encrypted_frame(data_header->frame_ctrl)) strip_length += 8; - + /* Process 4-way authentication handshake. */ uint16_t *proto = (uint16_t *) (buffer + strip_length); @@ -1655,5 +1655,5 @@ buffer + strip_length + sizeof(uint16_t), buffer_size - strip_length - sizeof(uint16_t)); - + /* * Note: ETH protocol ID is already there, so we don't create @@ -1663,8 +1663,8 @@ buffer_size - strip_length + sizeof(eth_header_t) - 2; nic_frame_t *frame = nic_alloc_frame(nic, frame_size); - + if(frame == NULL) return ENOMEM; - + uint8_t *src_addr = ieee80211_is_fromds_frame(data_header->frame_ctrl) ? @@ -1673,15 +1673,15 @@ ieee80211_is_tods_frame(data_header->frame_ctrl) ? data_header->address3 : data_header->address1; - + eth_header_t *eth_header = (eth_header_t *) frame->data; memcpy(eth_header->src_addr, src_addr, ETH_ADDR); memcpy(eth_header->dest_addr, dest_addr, ETH_ADDR); - + memcpy(frame->data + sizeof(eth_header_t) - 2, buffer + strip_length, buffer_size - strip_length); - + nic_received_frame(nic, frame); } - + return EOK; } @@ -1700,18 +1700,18 @@ { uint16_t frame_ctrl = *((uint16_t *) buffer); - + if (ieee80211_is_mgmt_frame(frame_ctrl)) { ieee80211_mgmt_header_t *mgmt_header = (ieee80211_mgmt_header_t *) buffer; - + if ((ieee80211_is_probe_response_frame(mgmt_header->frame_ctrl)) || (ieee80211_is_beacon_frame(mgmt_header->frame_ctrl))) return ieee80211_process_probe_response(ieee80211_dev, mgmt_header, buffer_size); - + if (ieee80211_is_auth_frame(mgmt_header->frame_ctrl)) return ieee80211_process_auth_response(ieee80211_dev, mgmt_header); - + if (ieee80211_is_assoc_response_frame(mgmt_header->frame_ctrl)) return ieee80211_process_assoc_response(ieee80211_dev, @@ -1720,5 +1720,5 @@ return ieee80211_process_data(ieee80211_dev, buffer, buffer_size); - + return EOK; } Index: uspace/lib/ieee80211/src/ieee80211_iface_impl.c =================================================================== --- uspace/lib/ieee80211/src/ieee80211_iface_impl.c (revision 1b20da07baaa3e3c424f62c927274e676e4295cd) +++ uspace/lib/ieee80211/src/ieee80211_iface_impl.c (revision 8565a42398543d14e36b2df6f7a70c6237b458f8) @@ -55,17 +55,17 @@ nic_t *nic_data = nic_get_from_ddf_fun(fun); ieee80211_dev_t *ieee80211_dev = nic_get_specific(nic_data); - + if (!ieee80211_is_ready(ieee80211_dev)) return EREFUSED; - + if (now) ieee80211_dev->ops->scan(ieee80211_dev); - + fibril_mutex_lock(&ieee80211_dev->ap_list.results_mutex); - + if (results) { ieee80211_scan_result_list_t *result_list = &ieee80211_dev->ap_list; - + unsigned int i = 0; ieee80211_scan_result_list_foreach(*result_list, result) { @@ -75,10 +75,10 @@ i++; } - + results->length = i; } - + fibril_mutex_unlock(&ieee80211_dev->ap_list.results_mutex); - + return EOK; } @@ -102,5 +102,5 @@ { ieee80211_dev->bssid_info.res_link = auth_data; - + /* Set channel. */ errno_t rc = ieee80211_dev->ops->set_freq(ieee80211_dev, @@ -108,16 +108,16 @@ if (rc != EOK) return rc; - + /* Try to authenticate. */ ieee80211_authenticate(ieee80211_dev); - + fibril_mutex_lock(&ieee80211_dev->gen_mutex); rc = fibril_condvar_wait_timeout(&ieee80211_dev->gen_cond, &ieee80211_dev->gen_mutex, AUTH_TIMEOUT); fibril_mutex_unlock(&ieee80211_dev->gen_mutex); - + if (rc != EOK) return rc; - + if (ieee80211_get_auth_phase(ieee80211_dev) != IEEE80211_AUTH_AUTHENTICATED) { @@ -126,16 +126,16 @@ return EINVAL; } - + /* Try to associate. */ ieee80211_associate(ieee80211_dev, password); - + fibril_mutex_lock(&ieee80211_dev->gen_mutex); rc = fibril_condvar_wait_timeout(&ieee80211_dev->gen_cond, &ieee80211_dev->gen_mutex, AUTH_TIMEOUT); fibril_mutex_unlock(&ieee80211_dev->gen_mutex); - + if (rc != EOK) return rc; - + if (ieee80211_get_auth_phase(ieee80211_dev) != IEEE80211_AUTH_ASSOCIATED) { @@ -144,15 +144,15 @@ return EINVAL; } - + /* On open network, we are finished. */ if (auth_data->scan_result.security.type != IEEE80211_SECURITY_OPEN) { /* Otherwise wait for 4-way handshake to complete. */ - + fibril_mutex_lock(&ieee80211_dev->gen_mutex); rc = fibril_condvar_wait_timeout(&ieee80211_dev->gen_cond, &ieee80211_dev->gen_mutex, HANDSHAKE_TIMEOUT); fibril_mutex_unlock(&ieee80211_dev->gen_mutex); - + if (rc != EOK) { ieee80211_deauthenticate(ieee80211_dev); @@ -160,7 +160,7 @@ } } - + ieee80211_set_auth_phase(ieee80211_dev, IEEE80211_AUTH_CONNECTED); - + return EOK; } @@ -182,11 +182,11 @@ assert(ssid_start); assert(password); - + nic_t *nic_data = nic_get_from_ddf_fun(fun); ieee80211_dev_t *ieee80211_dev = nic_get_specific(nic_data); - + if (!ieee80211_is_ready(ieee80211_dev)) return EREFUSED; - + if (ieee80211_is_connected(ieee80211_dev)) { errno_t rc = ieee80211_dev->iface->disconnect(fun); @@ -194,12 +194,12 @@ return rc; } - + ieee80211_set_connect_request(ieee80211_dev); - + errno_t rc = ENOENT; fibril_mutex_lock(&ieee80211_dev->scan_mutex); - + ieee80211_dev->pending_conn_req = false; - + ieee80211_scan_result_list_foreach(ieee80211_dev->ap_list, result) { if (!str_lcmp(ssid_start, result->scan_result.ssid, @@ -210,7 +210,7 @@ } } - + fibril_mutex_unlock(&ieee80211_dev->scan_mutex); - + return rc; } @@ -228,15 +228,15 @@ nic_t *nic_data = nic_get_from_ddf_fun(fun); ieee80211_dev_t *ieee80211_dev = nic_get_specific(nic_data); - + if (!ieee80211_is_ready(ieee80211_dev)) return EREFUSED; - + if (!ieee80211_is_connected(ieee80211_dev)) return EOK; - + fibril_mutex_lock(&ieee80211_dev->ap_list.results_mutex); errno_t rc = ieee80211_deauthenticate(ieee80211_dev); fibril_mutex_unlock(&ieee80211_dev->ap_list.results_mutex); - + return rc; } Index: uspace/lib/ieee80211/src/ieee80211_impl.c =================================================================== --- uspace/lib/ieee80211/src/ieee80211_impl.c (revision 1b20da07baaa3e3c424f62c927274e676e4295cd) +++ uspace/lib/ieee80211/src/ieee80211_impl.c (revision 8565a42398543d14e36b2df6f7a70c6237b458f8) @@ -119,18 +119,18 @@ { fibril_mutex_lock(&ieee80211_dev->scan_mutex); - + if (ieee80211_get_auth_phase(ieee80211_dev) == IEEE80211_AUTH_DISCONNECTED) { fibril_mutex_lock(&ieee80211_dev->ap_list.results_mutex); - + /* Remove old entries we don't receive beacons from. */ ieee80211_scan_result_list_t *result_list = &ieee80211_dev->ap_list; - + list_foreach_safe(result_list->list, cur_link, next_link) { ieee80211_scan_result_link_t *cur_result = list_get_instance(cur_link, ieee80211_scan_result_link_t, link); - + if ((time(NULL) - cur_result->last_beacon) > MAX_KEEP_SCAN_SPAN_SEC) @@ -138,26 +138,26 @@ cur_result); } - + fibril_mutex_unlock(&ieee80211_dev->ap_list.results_mutex); - + uint16_t orig_freq = ieee80211_dev->current_freq; - + for (uint16_t freq = IEEE80211_FIRST_FREQ; freq <= IEEE80211_MAX_FREQ; freq += IEEE80211_CHANNEL_GAP) { if (ieee80211_pending_connect_request(ieee80211_dev)) break; - + ieee80211_dev->ops->set_freq(ieee80211_dev, freq); ieee80211_probe_request(ieee80211_dev, NULL); - + /* Wait for probe responses. */ async_usleep(SCAN_CHANNEL_WAIT_USEC); } - + ieee80211_dev->ops->set_freq(ieee80211_dev, orig_freq); } - + fibril_mutex_unlock(&ieee80211_dev->scan_mutex); - + return EOK; } @@ -183,21 +183,21 @@ if ((!key) || (!data)) return EINVAL; - + if (!hash) return ENOMEM; - + size_t iters = ((output_size * 8) + 159) / 160; - + const char *a = "Pairwise key expansion"; uint8_t result[HASH_SHA1 * iters]; uint8_t temp[HASH_SHA1]; - + size_t data_size = PRF_CRYPT_DATA_LENGTH + str_size(a) + 2; uint8_t work_arr[data_size]; memset(work_arr, 0, data_size); - + memcpy(work_arr, a, str_size(a)); memcpy(work_arr + str_size(a) + 1, data, PRF_CRYPT_DATA_LENGTH); - + for (uint8_t i = 0; i < iters; i++) { memcpy(work_arr + data_size - 1, &i, 1); @@ -206,7 +206,7 @@ memcpy(result + i*HASH_SHA1, temp, HASH_SHA1); } - + memcpy(hash, result, output_size); - + return EOK; } @@ -223,8 +223,8 @@ if ((!kek) || (!data)) return EINVAL; - + if (!output) return ENOMEM; - + uint32_t n = data_size / 8 - 1; uint8_t work_data[n * 8]; @@ -233,10 +233,10 @@ uint8_t *work_block; uint8_t a[8]; - + memcpy(a, data, 8); - + uint64_t mask = 0xff; uint8_t shift, shb; - + memcpy(work_data, data + 8, n * 8); for (int j = 5; j >= 0; j--) { @@ -247,5 +247,5 @@ a[k] ^= shb; } - + work_block = work_data + (i - 1) * 8; memcpy(work_input, a, 8); @@ -256,5 +256,5 @@ } } - + size_t it; for (it = 0; it < 8; it++) { @@ -262,10 +262,10 @@ break; } - + if (it == 8) { memcpy(output, work_data, n * 8); return EOK; } - + return EINVAL; } @@ -290,19 +290,19 @@ if ((!key) || (!buffer)) return EINVAL; - + if (!mic) return ENOMEM; - + uint32_t l = uint32le_from_seq(key); uint32_t r = uint32le_from_seq(key + 4); - + ieee80211_data_header_t *data_header = (ieee80211_data_header_t *) buffer; - + uint8_t *data = buffer + sizeof(ieee80211_data_header_t) + IEEE80211_TKIP_HEADER_LENGTH; size_t data_size = size - sizeof(ieee80211_data_header_t) - IEEE80211_TKIP_HEADER_LENGTH; - + /* Process header. */ uint8_t *src_addr = @@ -312,5 +312,5 @@ ieee80211_is_tods_frame(data_header->frame_ctrl) ? data_header->address3 : data_header->address1; - + ieee80211_michael_mic_block(&l, &r, uint32le_from_seq(dest_addr)); ieee80211_michael_mic_block(&l, &r, @@ -319,14 +319,14 @@ ieee80211_michael_mic_block(&l, &r, uint32le_from_seq(src_addr + 2)); ieee80211_michael_mic_block(&l, &r, 0); - + /* Process data. */ size_t blocks = data_size / 4; size_t pad = data_size % 4; - + for (size_t k = 0; k < blocks; k++) { ieee80211_michael_mic_block(&l, &r, uint32le_from_seq(&data[k * 4])); } - + /* Add padding. */ uint32_t value = 0x5a; @@ -335,14 +335,14 @@ value |= data[blocks * 4 + (i - 1)]; } - + ieee80211_michael_mic_block(&l, &r, value); ieee80211_michael_mic_block(&l, &r, 0); - + l = host2uint32_t_le(l); r = host2uint32_t_le(r); - + memcpy(mic, &l, 4); memcpy(mic + 4, &r, 4); - + return EOK; } @@ -376,8 +376,8 @@ if (!sequence) return ENOMEM; - + for (size_t i = 0; i < length; i++) sequence[i] = (uint8_t) rand(); - + return EOK; } @@ -387,5 +387,5 @@ if ((!seq1) || (!seq2)) return NULL; - + for (size_t i = 0; i < size; i++) { if (seq1[i] < seq2[i]) @@ -394,5 +394,5 @@ return seq2; } - + return seq1; } @@ -403,5 +403,5 @@ if (min == seq1) return seq2; - + return seq1; }