aboutsummaryrefslogtreecommitdiffstats
path: root/hostapd
diff options
context:
space:
mode:
authorAnton Nayshtut <qca_antonn@qca.qualcomm.com>2015-01-21 15:30:48 +0200
committerLinux Build Service Account <lnxbuild@localhost>2015-10-06 03:19:38 -0600
commitcc7b555d3c31d9cab80dc37b77a2871d5c9c738a (patch)
tree9d8723d1392282343c064387bc40a354ecc0970d /hostapd
parent51e98be5dce9072ba317b8e922e0c1f2ead75be6 (diff)
downloadandroid_external_wpa_supplicant_8-cc7b555d3c31d9cab80dc37b77a2871d5c9c738a.tar.gz
android_external_wpa_supplicant_8-cc7b555d3c31d9cab80dc37b77a2871d5c9c738a.tar.bz2
android_external_wpa_supplicant_8-cc7b555d3c31d9cab80dc37b77a2871d5c9c738a.zip
FST: Integration into hostapd
This commit integrates the FST into the hostapd. Change-Id: Ifd23c80d89084bd052dec8ca0767e5d5844c40f4 Signed-off-by: Jouni Malinen <jouni@qca.qualcomm.com> Git-commit: 6959145b86318710d0186b618d54bce2991a6e6f Git-repo: git://w1.fi/srv/git/hostap.git CRs-Fixed: 891455
Diffstat (limited to 'hostapd')
-rw-r--r--hostapd/main.c14
1 files changed, 14 insertions, 0 deletions
diff --git a/hostapd/main.c b/hostapd/main.c
index 62d07754..534f1823 100644
--- a/hostapd/main.c
+++ b/hostapd/main.c
@@ -24,6 +24,7 @@
#include "ap/hostapd.h"
#include "ap/ap_config.h"
#include "ap/ap_drv_ops.h"
+#include "fst/fst.h"
#include "config_file.h"
#include "eap_register.h"
#include "ctrl_iface.h"
@@ -666,6 +667,17 @@ int main(int argc, char *argv[])
return -1;
}
+ if (fst_global_init()) {
+ wpa_printf(MSG_ERROR,
+ "Failed to initialize global FST context");
+ goto out;
+ }
+
+#if defined(CONFIG_FST) && defined(CONFIG_CTRL_IFACE)
+ if (!fst_global_add_ctrl(fst_ctrl_cli))
+ wpa_printf(MSG_WARNING, "Failed to add CLI FST ctrl");
+#endif /* CONFIG_FST && CONFIG_CTRL_IFACE */
+
/* Allocate and parse configuration for full interface files */
for (i = 0; i < interfaces.count; i++) {
interfaces.iface[i] = hostapd_interface_init(&interfaces,
@@ -759,6 +771,8 @@ int main(int argc, char *argv[])
os_free(bss_config);
+ fst_global_deinit();
+
os_program_deinit();
return ret;