diff options
| author | Steve Kondik <shade@chemlab.org> | 2012-08-05 23:45:06 +0400 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@review.cyanogenmod.com> | 2012-08-05 23:45:06 +0400 |
| commit | 1e653943e85ccd9efaa105459d4b7df14d24c49e (patch) | |
| tree | 17b27508f5f8c7dd2c156bba437e054811483d67 | |
| parent | 761806989e3c9d44bba9b477ca125e3edf522137 (diff) | |
| parent | b4230c2143698d310b6bdb1da7011d0f15766da4 (diff) | |
| download | android_external_wpa_supplicant_8-1e653943e85ccd9efaa105459d4b7df14d24c49e.tar.gz android_external_wpa_supplicant_8-1e653943e85ccd9efaa105459d4b7df14d24c49e.tar.bz2 android_external_wpa_supplicant_8-1e653943e85ccd9efaa105459d4b7df14d24c49e.zip | |
Merge "wpa_supplicant_8 - Hostapd: Android related changes for sockets" into jellybean
| -rw-r--r-- | hostapd/Android.mk | 6 | ||||
| -rw-r--r-- | hostapd/ctrl_iface.c | 16 |
2 files changed, 22 insertions, 0 deletions
diff --git a/hostapd/Android.mk b/hostapd/Android.mk index 640e6e01..9ec55d5b 100644 --- a/hostapd/Android.mk +++ b/hostapd/Android.mk @@ -33,6 +33,12 @@ L_CFLAGS += -DANDROID_QCOM_PATCH L_CFLAGS += -DANDROID_P2P endif +ifdef USES_TI_MAC80211 +# 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/wpa_supplicant\" +endif + # To force sizeof(enum) = 4 ifeq ($(TARGET_ARCH),arm) L_CFLAGS += -mabi=aapcs-linux diff --git a/hostapd/ctrl_iface.c b/hostapd/ctrl_iface.c index 9d5a67e3..ee431e76 100644 --- a/hostapd/ctrl_iface.c +++ b/hostapd/ctrl_iface.c @@ -14,6 +14,10 @@ #include <sys/stat.h> #include <stddef.h> +#ifdef USES_TI_MAC80211 +#include <cutils/sockets.h> +#endif /* USES_TI_MAC80211 */ + #include "utils/common.h" #include "utils/eloop.h" #include "common/version.h" @@ -993,6 +997,14 @@ int hostapd_ctrl_iface_init(struct hostapd_data *hapd) if (hapd->conf->ctrl_interface == NULL) return 0; +#ifdef USES_TI_MAC80211 + os_snprintf(addr.sun_path, sizeof(addr.sun_path), "wpa_%s", + hapd->conf->ctrl_interface); + s = android_get_control_socket(addr.sun_path); + if (s >= 0) + goto havesock; +#endif /* USES_TI_MAC80211 */ + if (mkdir(hapd->conf->ctrl_interface, S_IRWXU | S_IRWXG) < 0) { if (errno == EEXIST) { wpa_printf(MSG_DEBUG, "Using existing control " @@ -1073,6 +1085,10 @@ int hostapd_ctrl_iface_init(struct hostapd_data *hapd) } os_free(fname); +#ifdef USES_TI_MAC80211 +havesock: +#endif /* USES_TI_MAC80211 */ + hapd->ctrl_sock = s; eloop_register_read_sock(s, hostapd_ctrl_iface_receive, hapd, NULL); |