aboutsummaryrefslogtreecommitdiffstats
path: root/hostapd
diff options
context:
space:
mode:
authorJeff Johnson <jjohnson@qca.qualcomm.com>2012-09-04 05:12:17 (GMT)
committerJouni Malinen <j@w1.fi>2013-11-07 22:22:32 (GMT)
commit2d39a4d8a5b23a6e612ab54bd6a1a05652de84c1 (patch)
tree4154bbedb22bfd5499b460201cce242f0a19610b /hostapd
parent1c6edec60cb990199cef0bbfc481eac137783763 (diff)
downloadhostap-2d39a4d8a5b23a6e612ab54bd6a1a05652de84c1.zip
hostap-2d39a4d8a5b23a6e612ab54bd6a1a05652de84c1.tar.gz
hostap-2d39a4d8a5b23a6e612ab54bd6a1a05652de84c1.tar.bz2
hostapd: Allow hostapd_cli to work on Android
Add definitions of the Android specific directories used for control interface sockets so that hostapd_cli can connect to the Android hostapd. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
Diffstat (limited to 'hostapd')
-rw-r--r--hostapd/Android.mk4
-rw-r--r--hostapd/hostapd_cli.c7
2 files changed, 10 insertions, 1 deletions
diff --git a/hostapd/Android.mk b/hostapd/Android.mk
index e0ae862..91b6ccf 100644
--- a/hostapd/Android.mk
+++ b/hostapd/Android.mk
@@ -36,6 +36,10 @@ ifeq ($(BOARD_WLAN_DEVICE), mrvl)
L_CFLAGS += -DANDROID_P2P
endif
+# Use Android specific directory for control interface sockets
+L_CFLAGS += -DCONFIG_CTRL_IFACE_CLIENT_DIR=\"/data/misc/wifi/sockets\"
+L_CFLAGS += -DCONFIG_CTRL_IFACE_DIR=\"/data/system/hostapd\"
+
# To force sizeof(enum) = 4
ifeq ($(TARGET_ARCH),arm)
L_CFLAGS += -mabi=aapcs-linux
diff --git a/hostapd/hostapd_cli.c b/hostapd/hostapd_cli.c
index 466ec0d..a1fdf6e 100644
--- a/hostapd/hostapd_cli.c
+++ b/hostapd/hostapd_cli.c
@@ -91,7 +91,12 @@ static const char *commands_help =
static struct wpa_ctrl *ctrl_conn;
static int hostapd_cli_quit = 0;
static int hostapd_cli_attached = 0;
-static const char *ctrl_iface_dir = "/var/run/hostapd";
+
+#ifndef CONFIG_CTRL_IFACE_DIR
+#define CONFIG_CTRL_IFACE_DIR "/var/run/hostapd"
+#endif /* CONFIG_CTRL_IFACE_DIR */
+static const char *ctrl_iface_dir = CONFIG_CTRL_IFACE_DIR;
+
static char *ctrl_ifname = NULL;
static const char *pid_file = NULL;
static const char *action_file = NULL;