238 lines
6.8 KiB
Diff
238 lines
6.8 KiB
Diff
--- a/wpa_supplicant/wpa_supplicant_i.h
|
|
+++ b/wpa_supplicant/wpa_supplicant_i.h
|
|
@@ -108,6 +108,11 @@ struct wpa_interface {
|
|
const char *ifname;
|
|
|
|
/**
|
|
+ * hostapd_ctrl - path to hostapd control socket for notification
|
|
+ */
|
|
+ const char *hostapd_ctrl;
|
|
+
|
|
+ /**
|
|
* bridge_ifname - Optional bridge interface name
|
|
*
|
|
* If the driver interface (ifname) is included in a Linux bridge
|
|
@@ -395,6 +400,8 @@ struct wpa_supplicant {
|
|
#endif /* CONFIG_CTRL_IFACE_DBUS_NEW */
|
|
char bridge_ifname[16];
|
|
|
|
+ struct wpa_ctrl *hostapd;
|
|
+
|
|
char *confname;
|
|
char *confanother;
|
|
|
|
--- a/wpa_supplicant/Makefile
|
|
+++ b/wpa_supplicant/Makefile
|
|
@@ -13,6 +13,10 @@ PKG_CONFIG ?= pkg-config
|
|
CFLAGS += -I$(abspath ../src)
|
|
CFLAGS += -I$(abspath ../src/utils)
|
|
|
|
+ifdef MULTICALL
|
|
+CFLAGS += -DMULTICALL
|
|
+endif
|
|
+
|
|
-include .config
|
|
-include $(if $(MULTICALL),../hostapd/.config)
|
|
|
|
@@ -82,6 +86,8 @@ OBJS_c = wpa_cli.o ../src/common/wpa_ctr
|
|
OBJS_c += ../src/utils/wpa_debug.o
|
|
OBJS_c += ../src/utils/common.o
|
|
|
|
+OBJS += ../src/common/wpa_ctrl.o
|
|
+
|
|
ifndef CONFIG_OS
|
|
ifdef CONFIG_NATIVE_WINDOWS
|
|
CONFIG_OS=win32
|
|
--- a/wpa_supplicant/wpa_supplicant.c
|
|
+++ b/wpa_supplicant/wpa_supplicant.c
|
|
@@ -105,6 +105,55 @@ const char *wpa_supplicant_full_license5
|
|
"\n";
|
|
#endif /* CONFIG_NO_STDOUT_DEBUG */
|
|
|
|
+static int hostapd_stop(struct wpa_supplicant *wpa_s)
|
|
+{
|
|
+ const char *cmd = "DOWN";
|
|
+ char buf[256];
|
|
+ int len = sizeof(buf);
|
|
+
|
|
+ if (wpa_ctrl_request(wpa_s->hostapd, cmd, os_strlen(cmd), buf, &len, NULL) < 0) {
|
|
+ wpa_printf(MSG_ERROR, "\nFailed to stop hostapd AP interfaces\n");
|
|
+ return -1;
|
|
+ }
|
|
+ return 0;
|
|
+}
|
|
+
|
|
+static int hostapd_reload(struct wpa_supplicant *wpa_s, struct wpa_bss *bss)
|
|
+{
|
|
+ char *cmd = NULL;
|
|
+ char buf[256];
|
|
+ int len = sizeof(buf);
|
|
+ enum hostapd_hw_mode hw_mode;
|
|
+ u8 channel;
|
|
+ int sec_chan = 0;
|
|
+ int ret;
|
|
+
|
|
+ if (!bss)
|
|
+ return;
|
|
+
|
|
+ if (bss->ht_param & HT_INFO_HT_PARAM_STA_CHNL_WIDTH) {
|
|
+ int sec = bss->ht_param & HT_INFO_HT_PARAM_SECONDARY_CHNL_OFF_MASK;
|
|
+ if (sec == HT_INFO_HT_PARAM_SECONDARY_CHNL_ABOVE)
|
|
+ sec_chan = 1;
|
|
+ else if (sec == HT_INFO_HT_PARAM_SECONDARY_CHNL_BELOW)
|
|
+ sec_chan = -1;
|
|
+ }
|
|
+
|
|
+ hw_mode = ieee80211_freq_to_chan(bss->freq, &channel);
|
|
+ if (asprintf(&cmd, "UPDATE channel=%d sec_chan=%d hw_mode=%d ieee80211n=%d",
|
|
+ channel, sec_chan, hw_mode, !!bss->ht_capab) < 0)
|
|
+ return -1;
|
|
+
|
|
+ ret = wpa_ctrl_request(wpa_s->hostapd, cmd, os_strlen(cmd), buf, &len, NULL);
|
|
+ free(cmd);
|
|
+
|
|
+ if (ret < 0) {
|
|
+ wpa_printf(MSG_ERROR, "\nFailed to reload hostapd AP interfaces\n");
|
|
+ return -1;
|
|
+ }
|
|
+ return 0;
|
|
+}
|
|
+
|
|
/* Configure default/group WEP keys for static WEP */
|
|
int wpa_set_wep_keys(struct wpa_supplicant *wpa_s, struct wpa_ssid *ssid)
|
|
{
|
|
@@ -711,8 +760,12 @@ void wpa_supplicant_set_state(struct wpa
|
|
#endif /* CONFIG_P2P */
|
|
|
|
sme_sched_obss_scan(wpa_s, 1);
|
|
+ if (wpa_s->hostapd)
|
|
+ hostapd_reload(wpa_s, wpa_s->current_bss);
|
|
} else if (state == WPA_DISCONNECTED || state == WPA_ASSOCIATING ||
|
|
state == WPA_ASSOCIATED) {
|
|
+ if (wpa_s->hostapd)
|
|
+ hostapd_stop(wpa_s);
|
|
wpa_s->new_connection = 1;
|
|
wpa_drv_set_operstate(wpa_s, 0);
|
|
#ifndef IEEE8021X_EAPOL
|
|
@@ -3595,6 +3648,20 @@ static int wpa_supplicant_init_iface(str
|
|
sizeof(wpa_s->bridge_ifname));
|
|
}
|
|
|
|
+ if (iface->hostapd_ctrl) {
|
|
+ char *cmd = "DOWN";
|
|
+ char buf[256];
|
|
+ int len = sizeof(buf);
|
|
+
|
|
+ wpa_s->hostapd = wpa_ctrl_open(iface->hostapd_ctrl);
|
|
+ if (!wpa_s->hostapd) {
|
|
+ wpa_printf(MSG_ERROR, "\nFailed to connect to hostapd\n");
|
|
+ return -1;
|
|
+ }
|
|
+ if (hostapd_stop(wpa_s) < 0)
|
|
+ return -1;
|
|
+ }
|
|
+
|
|
/* RSNA Supplicant Key Management - INITIALIZE */
|
|
eapol_sm_notify_portEnabled(wpa_s->eapol, FALSE);
|
|
eapol_sm_notify_portValid(wpa_s->eapol, FALSE);
|
|
@@ -3798,6 +3865,11 @@ static void wpa_supplicant_deinit_iface(
|
|
if (terminate)
|
|
wpa_msg(wpa_s, MSG_INFO, WPA_EVENT_TERMINATING);
|
|
|
|
+ if (wpa_s->hostapd) {
|
|
+ wpa_ctrl_close(wpa_s->hostapd);
|
|
+ wpa_s->hostapd = NULL;
|
|
+ }
|
|
+
|
|
if (wpa_s->ctrl_iface) {
|
|
wpa_supplicant_ctrl_iface_deinit(wpa_s->ctrl_iface);
|
|
wpa_s->ctrl_iface = NULL;
|
|
--- a/wpa_supplicant/bss.c
|
|
+++ b/wpa_supplicant/bss.c
|
|
@@ -11,6 +11,7 @@
|
|
#include "utils/common.h"
|
|
#include "utils/eloop.h"
|
|
#include "common/ieee802_11_defs.h"
|
|
+#include "common/ieee802_11_common.h"
|
|
#include "drivers/driver.h"
|
|
#include "wpa_supplicant_i.h"
|
|
#include "config.h"
|
|
@@ -247,6 +248,10 @@ static void calculate_update_time(const
|
|
static void wpa_bss_copy_res(struct wpa_bss *dst, struct wpa_scan_res *src,
|
|
struct os_reltime *fetch_time)
|
|
{
|
|
+ struct ieee80211_ht_capabilities *capab;
|
|
+ struct ieee80211_ht_operation *oper;
|
|
+ struct ieee802_11_elems elems;
|
|
+
|
|
dst->flags = src->flags;
|
|
os_memcpy(dst->bssid, src->bssid, ETH_ALEN);
|
|
dst->freq = src->freq;
|
|
@@ -257,6 +262,15 @@ static void wpa_bss_copy_res(struct wpa_
|
|
dst->level = src->level;
|
|
dst->tsf = src->tsf;
|
|
|
|
+ memset(&elems, 0, sizeof(elems));
|
|
+ ieee802_11_parse_elems((u8 *) (src + 1), src->ie_len, &elems, 0);
|
|
+ capab = (struct ieee80211_ht_capabilities *) elems.ht_capabilities;
|
|
+ oper = (struct ieee80211_ht_operation *) elems.ht_operation;
|
|
+ if (capab)
|
|
+ dst->ht_capab = le_to_host16(capab->ht_capabilities_info);
|
|
+ if (oper)
|
|
+ dst->ht_param = oper->ht_param;
|
|
+
|
|
calculate_update_time(fetch_time, src->age, &dst->last_update);
|
|
}
|
|
|
|
--- a/wpa_supplicant/main.c
|
|
+++ b/wpa_supplicant/main.c
|
|
@@ -33,7 +33,7 @@ static void usage(void)
|
|
"vW] [-P<pid file>] "
|
|
"[-g<global ctrl>] \\\n"
|
|
" [-G<group>] \\\n"
|
|
- " -i<ifname> -c<config file> [-C<ctrl>] [-D<driver>] "
|
|
+ " -i<ifname> -c<config file> [-C<ctrl>] [-D<driver>] [-H<hostapd path>] "
|
|
"[-p<driver_param>] \\\n"
|
|
" [-b<br_ifname>] [-e<entropy file>]"
|
|
#ifdef CONFIG_DEBUG_FILE
|
|
@@ -84,6 +84,7 @@ static void usage(void)
|
|
#endif /* CONFIG_DEBUG_LINUX_TRACING */
|
|
printf(" -t = include timestamp in debug messages\n"
|
|
" -h = show this help text\n"
|
|
+ " -H = connect to a hostapd instance to manage state changes\n"
|
|
" -L = show license (BSD)\n"
|
|
" -o = override driver parameter for new interfaces\n"
|
|
" -O = override ctrl_interface parameter for new interfaces\n"
|
|
@@ -175,7 +176,7 @@ int main(int argc, char *argv[])
|
|
|
|
for (;;) {
|
|
c = getopt(argc, argv,
|
|
- "b:Bc:C:D:de:f:g:G:hi:I:KLm:No:O:p:P:qsTtuvW");
|
|
+ "b:Bc:C:D:de:f:g:G:hH:i:I:KLm:No:O:p:P:qsTtuvW");
|
|
if (c < 0)
|
|
break;
|
|
switch (c) {
|
|
@@ -222,6 +223,9 @@ int main(int argc, char *argv[])
|
|
usage();
|
|
exitcode = 0;
|
|
goto out;
|
|
+ case 'H':
|
|
+ iface->hostapd_ctrl = optarg;
|
|
+ break;
|
|
case 'i':
|
|
iface->ifname = optarg;
|
|
break;
|
|
--- a/wpa_supplicant/bss.h
|
|
+++ b/wpa_supplicant/bss.h
|
|
@@ -70,6 +70,10 @@ struct wpa_bss {
|
|
u8 ssid[32];
|
|
/** Length of SSID */
|
|
size_t ssid_len;
|
|
+ /** HT caapbilities */
|
|
+ u16 ht_capab;
|
|
+ /* Five octets of HT Operation Information */
|
|
+ u8 ht_param;
|
|
/** Frequency of the channel in MHz (e.g., 2412 = channel 1) */
|
|
int freq;
|
|
/** Beacon interval in TUs (host byte order) */
|