From 2d39a4d8a5b23a6e612ab54bd6a1a05652de84c1 Mon Sep 17 00:00:00 2001 From: Jeff Johnson Date: Mon, 3 Sep 2012 22:12:17 -0700 Subject: [PATCH] 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 --- hostapd/Android.mk | 4 ++++ hostapd/hostapd_cli.c | 7 ++++++- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/hostapd/Android.mk b/hostapd/Android.mk index e0ae8627f..91b6ccfd8 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 466ec0d3c..a1fdf6ed3 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;