aboutsummaryrefslogtreecommitdiffstats
path: root/wpa_supplicant/main.c
diff options
context:
space:
mode:
authorAnton Nayshtut <qca_antonn@qca.qualcomm.com>2014-11-16 17:28:53 +0200
committerLinux Build Service Account <lnxbuild@localhost>2015-10-06 03:19:34 -0600
commit0d7a0aa9ffb9c988538e3079cc40f25531b8928b (patch)
treed4cab07e2a06525ebc52361a54c51faa94a984fa /wpa_supplicant/main.c
parent5f0259f410374e4e6622e55237cce1c4ed3468f0 (diff)
downloadandroid_external_wpa_supplicant_8-0d7a0aa9ffb9c988538e3079cc40f25531b8928b.tar.gz
android_external_wpa_supplicant_8-0d7a0aa9ffb9c988538e3079cc40f25531b8928b.tar.bz2
android_external_wpa_supplicant_8-0d7a0aa9ffb9c988538e3079cc40f25531b8928b.zip
FST: Integration into wpa_supplicant
This commit integrates the FST into the wpa_supplicant. Change-Id: I68d9af4bdadcbf95be0dc84abe09dd55d1b067ae Signed-off-by: Jouni Malinen <jouni@qca.qualcomm.com> Git-commit: b36a3a65aa35dd40ffad12d90629e683d4ae7db8 Git-repo: git://w1.fi/srv/git/hostap.git CRs-Fixed: 891455
Diffstat (limited to 'wpa_supplicant/main.c')
-rw-r--r--wpa_supplicant/main.c14
1 files changed, 14 insertions, 0 deletions
diff --git a/wpa_supplicant/main.c b/wpa_supplicant/main.c
index 1c933069..d5d47e1d 100644
--- a/wpa_supplicant/main.c
+++ b/wpa_supplicant/main.c
@@ -12,6 +12,7 @@
#endif /* __linux__ */
#include "common.h"
+#include "fst/fst.h"
#include "wpa_supplicant_i.h"
#include "driver_i.h"
#include "p2p_supplicant.h"
@@ -309,6 +310,17 @@ int main(int argc, char *argv[])
"wpa_supplicant");
}
+ if (fst_global_init()) {
+ wpa_printf(MSG_ERROR, "Failed to initialize FST");
+ exitcode = -1;
+ 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
+
for (i = 0; exitcode == 0 && i < iface_count; i++) {
struct wpa_supplicant *wpa_s;
@@ -334,6 +346,8 @@ int main(int argc, char *argv[])
wpa_supplicant_deinit(global);
+ fst_global_deinit();
+
out:
wpa_supplicant_fd_workaround(0);
os_free(ifaces);