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

hostapd: Set LCI and Location Civic information in configuration

Browse source 
Enable configuration of LCI and location civic information in
hostapd.conf.

Signed-off-by: David Spinadel <david.spinadel@intel.com>
This commit is contained in:
David Spinadel 2016-04-06 19:42:01 +03:00 • committed by Jouni Malinen
parent cb285151a9
commit 74e982d8d7
4 changed files with 19 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

8
hostapd/config_file.c
View file

@ -1920,7 +1920,6 @@ static int hs20_parse_osu_service_desc(struct hostapd_bss_config *bss,
#endif /* CONFIG_HS20 */ #endif /* CONFIG_HS20 */
#ifdef CONFIG_WPS_NFC
static struct wpabuf * hostapd_parse_bin(const char *buf) static struct wpabuf * hostapd_parse_bin(const char *buf)
{ {
size_t len; size_t len;
@ -1942,7 +1941,6 @@ static struct wpabuf * hostapd_parse_bin(const char *buf)
return ret; return ret;
} }
#endif /* CONFIG_WPS_NFC */
#ifdef CONFIG_ACS #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) { } else if (os_strcmp(buf, "no_auth_if_seen_on") == 0) {
os_free(bss->no_auth_if_seen_on); os_free(bss->no_auth_if_seen_on);
bss->no_auth_if_seen_on = os_strdup(pos); 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 { } else {
wpa_printf(MSG_ERROR, wpa_printf(MSG_ERROR,
"Line %d: unknown configuration item '%s'", "Line %d: unknown configuration item '%s'",

8
hostapd/hostapd.conf
View file

@ -1879,6 +1879,14 @@ own_ip_addr=127.0.0.1
# Transitioning between states). # Transitioning between states).
#fst_llt=100 #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 ######################################################### ##### TESTING OPTIONS #########################################################
# #
# The options in this section are only available when the build configuration # The options in this section are only available when the build configuration

2
src/ap/ap_config.c
View file

@ -606,6 +606,8 @@ void hostapd_config_free(struct hostapd_config *conf)
#ifdef CONFIG_ACS #ifdef CONFIG_ACS
os_free(conf->acs_chan_bias); os_free(conf->acs_chan_bias);
#endif /* CONFIG_ACS */ #endif /* CONFIG_ACS */
wpabuf_free(conf->lci);
wpabuf_free(conf->civic);
os_free(conf); os_free(conf);
} }

3
src/ap/ap_config.h
View file

@ -693,6 +693,9 @@ struct hostapd_config {
} *acs_chan_bias; } *acs_chan_bias;
unsigned int num_acs_chan_bias; unsigned int num_acs_chan_bias;
#endif /* CONFIG_ACS */ #endif /* CONFIG_ACS */
struct wpabuf *lci;
struct wpabuf *civic;
}; };