aboutsummaryrefslogtreecommitdiffstats
path: root/hostapd
diff options
context:
space:
mode:
authorDavid Spinadel <david.spinadel@intel.com>2016-04-06 16:42:01 (GMT)
committerJouni Malinen <j@w1.fi>2016-04-09 08:18:55 (GMT)
commit74e982d8d723ca6ff9e54dc01dbd3ed380048f9b (patch)
treeea8c03d06f11e2d83a563bf8b06a6ee63474576e /hostapd
parentcb285151a9961f16e0d11d0ac54d8c0a7a3830b9 (diff)
downloadhostap-74e982d8d723ca6ff9e54dc01dbd3ed380048f9b.zip
hostap-74e982d8d723ca6ff9e54dc01dbd3ed380048f9b.tar.gz
hostap-74e982d8d723ca6ff9e54dc01dbd3ed380048f9b.tar.bz2
hostapd: Set LCI and Location Civic information in configuration
Enable configuration of LCI and location civic information in hostapd.conf. Signed-off-by: David Spinadel <david.spinadel@intel.com>
Diffstat (limited to 'hostapd')
-rw-r--r--hostapd/config_file.c8
-rw-r--r--hostapd/hostapd.conf8
2 files changed, 14 insertions, 2 deletions
diff --git a/hostapd/config_file.c b/hostapd/config_file.c
index c35d5ae..9e17388 100644
--- a/hostapd/config_file.c
+++ b/hostapd/config_file.c
@@ -1920,7 +1920,6 @@ static int hs20_parse_osu_service_desc(struct hostapd_bss_config *bss,
#endif /* CONFIG_HS20 */
-#ifdef CONFIG_WPS_NFC
static struct wpabuf * hostapd_parse_bin(const char *buf)
{
size_t len;
@@ -1942,7 +1941,6 @@ static struct wpabuf * hostapd_parse_bin(const char *buf)
return ret;
}
-#endif /* CONFIG_WPS_NFC */
#ifdef CONFIG_ACS
@@ -3487,6 +3485,12 @@ static int hostapd_config_fill(struct hostapd_config *conf,
} else if (os_strcmp(buf, "no_auth_if_seen_on") == 0) {
os_free(bss->no_auth_if_seen_on);
bss->no_auth_if_seen_on = os_strdup(pos);
+ } else if (os_strcmp(buf, "lci") == 0) {
+ wpabuf_free(conf->lci);
+ conf->lci = hostapd_parse_bin(pos);
+ } else if (os_strcmp(buf, "civic") == 0) {
+ wpabuf_free(conf->civic);
+ conf->civic = hostapd_parse_bin(pos);
} else {
wpa_printf(MSG_ERROR,
"Line %d: unknown configuration item '%s'",
diff --git a/hostapd/hostapd.conf b/hostapd/hostapd.conf
index d943a43..dd7b466 100644
--- a/hostapd/hostapd.conf
+++ b/hostapd/hostapd.conf
@@ -1879,6 +1879,14 @@ own_ip_addr=127.0.0.1
# Transitioning between states).
#fst_llt=100
+##### Radio measurements / location ###########################################
+
+# The content of a LCI measurement subelement
+#lci=<Hexdump of binary data of the LCI report>
+
+# The content of a location civic measurement subelement
+#civic=<Hexdump of binary data of the location civic report>
+
##### TESTING OPTIONS #########################################################
#
# The options in this section are only available when the build configuration