7u83/freewtp
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

add support for CAPWAP IEEE 802.11 Information Element to AssocResponse

Browse Source
This commit is contained in:
Andreas Schultz 2016-02-29 15:30:54 +01:00
parent a85f07f18a
commit 484002b3e6
3 changed files with 28 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/common/binding/ieee80211/ieee80211.c
View File

@ -705,7 +705,8 @@ int ieee80211_create_associationresponse_response(uint8_t* buffer, int length, s
header = (struct ieee80211_header_mgmt*)buffer; header = (struct ieee80211_header_mgmt*)buffer;
/* Management header frame */ /* Management header frame */
header->framecontrol = IEEE80211_FRAME_CONTROL(IEEE80211_FRAMECONTROL_TYPE_MGMT, IEEE80211_FRAMECONTROL_MGMT_SUBTYPE_ASSOCIATION_RESPONSE); header->framecontrol = IEEE80211_FRAME_CONTROL(IEEE80211_FRAMECONTROL_TYPE_MGMT,
IEEE80211_FRAMECONTROL_MGMT_SUBTYPE_ASSOCIATION_RESPONSE);
header->durationid = __cpu_to_le16(0); header->durationid = __cpu_to_le16(0);
memcpy(header->da, params->station, ETH_ALEN); memcpy(header->da, params->station, ETH_ALEN);
memcpy(header->sa, params->bssid, ETH_ALEN); memcpy(header->sa, params->bssid, ETH_ALEN);
@ -734,9 +735,19 @@ int ieee80211_create_associationresponse_response(uint8_t* buffer, int length, s
return -1; return -1;
} }
/*pos += result;*/ /* Comment for disable Dead inscrement Clang Analyzer warning */ pos += result;
responselength += result; responselength += result;
log_printf(LOG_DEBUG, "IEEE80211: Association Response IE length: %d", params->response_ies_len);
if (params->response_ies_len) {
log_hexdump(LOG_DEBUG, "IEEE80211: Response IEs",
params->response_ies, params->response_ies_len);
memcpy(pos, params->response_ies, params->response_ies_len);
/* pos += params->response_ies_len; */ /* Comment for disable Dead inscrement Clang Analyzer warning */
responselength += params->response_ies_len;
}
return responselength; return responselength;
} }

3
src/common/binding/ieee80211/ieee80211.h
View File

@ -577,6 +577,9 @@ struct ieee80211_associationresponse_params {
int supportedratescount; int supportedratescount;
uint8_t supportedrates[IEEE80211_SUPPORTEDRATE_MAX_COUNT]; uint8_t supportedrates[IEEE80211_SUPPORTEDRATE_MAX_COUNT];
int response_ies_len;
uint8_t *response_ies;
}; };
int ieee80211_create_associationresponse_response(uint8_t* buffer, int length, struct ieee80211_associationresponse_params* params); int ieee80211_create_associationresponse_response(uint8_t* buffer, int length, struct ieee80211_associationresponse_params* params);

22
src/wtp/binding/ieee80211/wifi_drivers.c
View File

@ -654,7 +654,7 @@ static void wifi_wlan_receive_station_mgmt_association_request(struct wifi_wlan*
int ielength; int ielength;
int responselength; int responselength;
struct ieee80211_ie_items ieitems; struct ieee80211_ie_items ieitems;
struct ieee80211_associationresponse_params ieee80211_params; struct ieee80211_associationresponse_params params;
struct wifi_station* station; struct wifi_station* station;
uint16_t resultstatuscode; uint16_t resultstatuscode;
@ -716,16 +716,18 @@ static void wifi_wlan_receive_station_mgmt_association_request(struct wifi_wlan*
} }
/* Create association response packet */ /* Create association response packet */
memset(&ieee80211_params, 0, sizeof(struct ieee80211_authentication_params)); memset(&params, 0, sizeof(struct ieee80211_authentication_params));
memcpy(ieee80211_params.bssid, wlan->address, ETH_ALEN); memcpy(params.bssid, wlan->address, ETH_ALEN);
memcpy(ieee80211_params.station, frame->sa, ETH_ALEN); memcpy(params.station, frame->sa, ETH_ALEN);
ieee80211_params.capability = wifi_wlan_check_capability(wlan, wlan->capability); params.capability = wifi_wlan_check_capability(wlan, wlan->capability);
ieee80211_params.statuscode = resultstatuscode; params.statuscode = resultstatuscode;
ieee80211_params.aid = IEEE80211_AID_FIELD | station->aid; params.aid = IEEE80211_AID_FIELD | station->aid;
memcpy(ieee80211_params.supportedrates, wlan->device->supportedrates, wlan->device->supportedratescount); memcpy(params.supportedrates, wlan->device->supportedrates, wlan->device->supportedratescount);
ieee80211_params.supportedratescount = wlan->device->supportedratescount; params.supportedratescount = wlan->device->supportedratescount;
params.response_ies = wlan->response_ies;
params.response_ies_len = wlan->response_ies_len;
responselength = ieee80211_create_associationresponse_response(g_bufferIEEE80211, sizeof(g_bufferIEEE80211), &ieee80211_params); responselength = ieee80211_create_associationresponse_response(g_bufferIEEE80211, sizeof(g_bufferIEEE80211), &params);
if (responselength > 0) { if (responselength > 0) {
if (!wlan->device->instance->ops->wlan_sendframe(wlan, g_bufferIEEE80211, responselength, wlan->device->currentfrequency.frequency, 0, 0, 0, 0)) { if (!wlan->device->instance->ops->wlan_sendframe(wlan, g_bufferIEEE80211, responselength, wlan->device->currentfrequency.frequency, 0, 0, 0, 0)) {
capwap_logging_info("Sent IEEE802.11 Association Response to %s station with %d status code", station->addrtext, (int)resultstatuscode); capwap_logging_info("Sent IEEE802.11 Association Response to %s station with %d status code", station->addrtext, (int)resultstatuscode);