DGNum/hostapd
6
0
Fork 0
Code Issues Pull requests 1 Projects Releases Packages Wiki Activity Actions

Share a single function for building extended capabilities element

Browse source 
This makes it easier to update extended capabilities for all uses
within wpa_supplicant.

Signed-hostap: Jouni Malinen <j@w1.fi>
This commit is contained in:
Jouni Malinen 2012-12-22 19:17:15 +02:00
parent a5e1eb2092
commit 03e47c9c3a
3 changed files with 42 additions and 32 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
wpa_supplicant/sme.c
View file

@ -94,7 +94,8 @@ static void sme_send_authentication(struct wpa_supplicant *wpa_s,
#endif /* CONFIG_IEEE80211R */ #endif /* CONFIG_IEEE80211R */
int i, bssid_changed; int i, bssid_changed;
struct wpabuf *resp = NULL; struct wpabuf *resp = NULL;
u32 ext_capab; u8 ext_capab[10];
int ext_capab_len;
if (bss == NULL) { if (bss == NULL) {
wpa_msg(wpa_s, MSG_ERROR, "SME: No scan result available for " wpa_msg(wpa_s, MSG_ERROR, "SME: No scan result available for "
@ -309,26 +310,16 @@ static void sme_send_authentication(struct wpa_supplicant *wpa_s,
} }
#endif /* CONFIG_HS20 */ #endif /* CONFIG_HS20 */
ext_capab = 0; ext_capab_len = wpas_build_ext_capab(wpa_s, ext_capab);
#ifdef CONFIG_INTERWORKING if (ext_capab_len > 0) {
if (wpa_s->conf->interworking)
ext_capab |= BIT(31); /* Interworking */
#endif /* CONFIG_INTERWORKING */
#ifdef CONFIG_WNM
ext_capab |= BIT(17); /* WNM-Sleep Mode */
#endif /* CONFIG_WNM */
if (ext_capab) {
u8 *pos = wpa_s->sme.assoc_req_ie; u8 *pos = wpa_s->sme.assoc_req_ie;
if (wpa_s->sme.assoc_req_ie_len > 0 && pos[0] == WLAN_EID_RSN) if (wpa_s->sme.assoc_req_ie_len > 0 && pos[0] == WLAN_EID_RSN)
pos += 2 + pos[1]; pos += 2 + pos[1];
os_memmove(pos + 6, pos, os_memmove(pos + ext_capab_len, pos,
wpa_s->sme.assoc_req_ie_len - wpa_s->sme.assoc_req_ie_len -
(pos - wpa_s->sme.assoc_req_ie)); (pos - wpa_s->sme.assoc_req_ie));
wpa_s->sme.assoc_req_ie_len += 6; wpa_s->sme.assoc_req_ie_len += ext_capab_len;
*pos++ = WLAN_EID_EXT_CAPAB; os_memcpy(pos, ext_capab, ext_capab_len);
*pos++ = 4;
WPA_PUT_LE32(pos, ext_capab);
} }
#ifdef CONFIG_SAE #ifdef CONFIG_SAE

50
wpa_supplicant/wpa_supplicant.c
View file

@ -1230,6 +1230,32 @@ int wpa_supplicant_set_suites(struct wpa_supplicant *wpa_s,
} }
int wpas_build_ext_capab(struct wpa_supplicant *wpa_s, u8 *buf)
{
u32 ext_capab = 0;
u8 *pos = buf;
#ifdef CONFIG_INTERWORKING
if (wpa_s->conf->interworking)
ext_capab |= BIT(31); /* Interworking */
#endif /* CONFIG_INTERWORKING */
#ifdef CONFIG_WNM
ext_capab |= BIT(17); /* WNM-Sleep Mode */
#endif /* CONFIG_WNM */
if (!ext_capab)
return 0;
*pos++ = WLAN_EID_EXT_CAPAB;
*pos++ = 4;
WPA_PUT_LE32(pos, ext_capab);
pos += 4;
return pos - buf;
}
/** /**
* wpa_supplicant_associate - Request association * wpa_supplicant_associate - Request association
* @wpa_s: Pointer to wpa_supplicant data * @wpa_s: Pointer to wpa_supplicant data
@ -1251,7 +1277,8 @@ void wpa_supplicant_associate(struct wpa_supplicant *wpa_s,
struct wpa_driver_capa capa; struct wpa_driver_capa capa;
int assoc_failed = 0; int assoc_failed = 0;
struct wpa_ssid *old_ssid; struct wpa_ssid *old_ssid;
u32 ext_capab; u8 ext_capab[10];
int ext_capab_len;
#ifdef CONFIG_HT_OVERRIDES #ifdef CONFIG_HT_OVERRIDES
struct ieee80211_ht_capabilities htcaps; struct ieee80211_ht_capabilities htcaps;
struct ieee80211_ht_capabilities htcaps_mask; struct ieee80211_ht_capabilities htcaps_mask;
@ -1462,24 +1489,15 @@ void wpa_supplicant_associate(struct wpa_supplicant *wpa_s,
} }
#endif /* CONFIG_HS20 */ #endif /* CONFIG_HS20 */
ext_capab = 0; ext_capab_len = wpas_build_ext_capab(wpa_s, ext_capab);
#ifdef CONFIG_INTERWORKING if (ext_capab_len > 0) {
if (wpa_s->conf->interworking)
ext_capab |= BIT(31); /* Interworking */
#endif /* CONFIG_INTERWORKING */
#ifdef CONFIG_WNM
ext_capab |= BIT(17); /* WNM-Sleep Mode */
#endif /* CONFIG_WNM */
if (ext_capab) {
u8 *pos = wpa_ie; u8 *pos = wpa_ie;
if (wpa_ie_len > 0 && pos[0] == WLAN_EID_RSN) if (wpa_ie_len > 0 && pos[0] == WLAN_EID_RSN)
pos += 2 + pos[1]; pos += 2 + pos[1];
os_memmove(pos + 6, pos, wpa_ie_len - (pos - wpa_ie)); os_memmove(pos + ext_capab_len, pos,
wpa_ie_len += 6; wpa_ie_len - (pos - wpa_ie));
*pos++ = WLAN_EID_EXT_CAPAB; wpa_ie_len += ext_capab_len;
*pos++ = 4; os_memcpy(pos, ext_capab, ext_capab_len);
WPA_PUT_LE32(pos, ext_capab);
} }
wpa_clear_keys(wpa_s, bss ? bss->bssid : NULL); wpa_clear_keys(wpa_s, bss ? bss->bssid : NULL);

1
wpa_supplicant/wpa_supplicant_i.h
View file

@ -762,6 +762,7 @@ int disallowed_bssid(struct wpa_supplicant *wpa_s, const u8 *bssid);
int disallowed_ssid(struct wpa_supplicant *wpa_s, const u8 *ssid, int disallowed_ssid(struct wpa_supplicant *wpa_s, const u8 *ssid,
size_t ssid_len); size_t ssid_len);
void wpas_request_connection(struct wpa_supplicant *wpa_s); void wpas_request_connection(struct wpa_supplicant *wpa_s);
int wpas_build_ext_capab(struct wpa_supplicant *wpa_s, u8 *buf);
/** /**
* wpa_supplicant_ctrl_iface_ctrl_rsp_handle - Handle a control response * wpa_supplicant_ctrl_iface_ctrl_rsp_handle - Handle a control response