From: Jouni Malinen Date: Thu, 21 Mar 2013 13:41:27 +0000 (+0200) Subject: Add vendor_elements into Beacon/Probe Response IE parameters X-Git-Tag: aosp-kk-from-upstream~430 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b084df8b812c43ab9732323df3c8189aa27f0f5c;p=thirdparty%2Fhostap.git Add vendor_elements into Beacon/Probe Response IE parameters Commit b52f084cfaae5a10bf5886cfa159d2df0dfc350a introduced a mechanism for adding arbitrary vendor-specific elements into the Beacon and Probe Response frames. However, this information was not added to the separate buffers used for specifying Beacon and Probe Response IEs for drivers that build the frames internally. Add vendor_elements to these values, too, to support such drivers in addition to drivers that use the full Beacon tail/head buffers. Signed-hostap: Jouni Malinen --- diff --git a/src/ap/ap_drv_ops.c b/src/ap/ap_drv_ops.c index b71d51d8b..8205d132a 100644 --- a/src/ap/ap_drv_ops.c +++ b/src/ap/ap_drv_ops.c @@ -173,6 +173,14 @@ int hostapd_build_ap_extra_ies(struct hostapd_data *hapd, } #endif /* CONFIG_HS20 */ + if (hapd->conf->vendor_elements) { + size_t add = wpabuf_len(hapd->conf->vendor_elements); + if (wpabuf_resize(&beacon, add) == 0) + wpabuf_put_buf(beacon, hapd->conf->vendor_elements); + if (wpabuf_resize(&proberesp, add) == 0) + wpabuf_put_buf(proberesp, hapd->conf->vendor_elements); + } + *beacon_ret = beacon; *proberesp_ret = proberesp; *assocresp_ret = assocresp;