1 --- a/wpa_supplicant/wpa_supplicant_i.h
2 +++ b/wpa_supplicant/wpa_supplicant_i.h
3 @@ -98,6 +98,8 @@ struct wpa_interface {
4 * receiving of EAPOL frames from an additional interface.
6 const char *bridge_ifname;
8 + const char *hostapd_ctrl;
12 @@ -316,6 +318,8 @@ struct wpa_supplicant {
13 #endif /* CONFIG_CTRL_IFACE_DBUS_NEW */
14 char bridge_ifname[16];
16 + struct wpa_ctrl *hostapd;
19 struct wpa_config *conf;
21 --- a/wpa_supplicant/Makefile
22 +++ b/wpa_supplicant/Makefile
23 @@ -51,6 +51,11 @@ OBJS_p += ../src/utils/wpa_debug.o
24 OBJS_p += ../src/utils/wpabuf.o
25 OBJS_c = wpa_cli.o ../src/common/wpa_ctrl.o
28 +OBJS += ../src/common/wpa_ctrl.o
29 +CFLAGS += -DMULTICALL
33 -include $(if $(MULTICALL),../hostapd/.config)
35 --- a/wpa_supplicant/wpa_supplicant.c
36 +++ b/wpa_supplicant/wpa_supplicant.c
37 @@ -120,6 +120,58 @@ extern int wpa_debug_show_keys;
38 extern int wpa_debug_timestamp;
39 extern struct wpa_driver_ops *wpa_drivers[];
42 +static int hostapd_stop(struct wpa_supplicant *wpa_s)
44 + const char *cmd = "DOWN";
46 + int len = sizeof(buf);
48 + if (wpa_ctrl_request(wpa_s->hostapd, cmd, os_strlen(cmd), buf, &len, NULL) < 0) {
49 + wpa_printf(MSG_ERROR, "\nFailed to stop hostapd AP interfaces\n");
55 +static int hostapd_reload(struct wpa_supplicant *wpa_s, struct wpa_bss *bss)
59 + int len = sizeof(buf);
60 + int channel, hw_mode;
66 + if (bss->freq < 4000) {
67 + hw_mode = HOSTAPD_MODE_IEEE80211G;
68 + channel = (bss->freq - 2407) / 5;
70 + hw_mode = HOSTAPD_MODE_IEEE80211A;
71 + channel = (bss->freq - 5000) / 5;
74 + if (asprintf(&cmd, "RELOAD channel=%d sec_chan=0 hw_mode=%d ht_capab_mask=%d ieee80211n=%d",
75 + channel, hw_mode, bss->ht_capab, !!bss->ht_capab) < 0) {
76 + fprintf(stderr, "ASPRINTF FAILED\n");
81 + wpa_printf(MSG_ERROR, "\n\n-------- RUN COMMAND: %s\n\n", cmd);
82 + ret = wpa_ctrl_request(wpa_s->hostapd, cmd, os_strlen(cmd), buf, &len, NULL);
86 + wpa_printf(MSG_ERROR, "\nFailed to reload hostapd AP interfaces\n");
93 /* Configure default/group WEP keys for static WEP */
94 int wpa_set_wep_keys(struct wpa_supplicant *wpa_s, struct wpa_ssid *ssid)
96 @@ -548,6 +600,10 @@ void wpa_supplicant_set_state(struct wpa
97 #ifndef IEEE8021X_EAPOL
98 wpa_drv_set_supp_port(wpa_s, 1);
101 + if (wpa_s->hostapd)
102 + hostapd_reload(wpa_s, wpa_s->current_bss);
104 } else if (state == WPA_DISCONNECTED || state == WPA_ASSOCIATING ||
105 state == WPA_ASSOCIATED) {
106 wpa_s->new_connection = 1;
107 @@ -1957,6 +2013,21 @@ static int wpa_supplicant_init_iface(str
108 os_strlcpy(wpa_s->bridge_ifname, iface->bridge_ifname,
109 sizeof(wpa_s->bridge_ifname));
112 + if (iface->hostapd_ctrl) {
113 + char *cmd = "DOWN";
115 + int len = sizeof(buf);
117 + wpa_s->hostapd = wpa_ctrl_open(iface->hostapd_ctrl);
118 + if (!wpa_s->hostapd) {
119 + wpa_printf(MSG_ERROR, "\nFailed to connect to hostapd\n");
122 + if (hostapd_stop(wpa_s) < 0)
127 /* RSNA Supplicant Key Management - INITIALIZE */
128 eapol_sm_notify_portEnabled(wpa_s->eapol, FALSE);
129 --- a/wpa_supplicant/bss.c
130 +++ b/wpa_supplicant/bss.c
132 #include "utils/common.h"
133 #include "utils/eloop.h"
134 #include "common/ieee802_11_defs.h"
135 +#include "common/ieee802_11_common.h"
136 #include "drivers/driver.h"
137 #include "wpa_supplicant_i.h"
139 @@ -89,6 +90,8 @@ struct wpa_bss * wpa_bss_get(struct wpa_
141 static void wpa_bss_copy_res(struct wpa_bss *dst, struct wpa_scan_res *src)
143 + struct ieee80211_ht_capabilities *capab;
144 + struct ieee802_11_elems elems;
147 dst->flags = src->flags;
148 @@ -101,6 +104,12 @@ static void wpa_bss_copy_res(struct wpa_
149 dst->level = src->level;
152 + memset(&elems, 0, sizeof(elems));
153 + ieee802_11_parse_elems((u8 *) (src + 1), src->ie_len, &elems, 0);
154 + capab = (struct ieee80211_ht_capabilities *) elems.ht_capabilities;
156 + dst->ht_capab = le_to_host16(capab->ht_capabilities_info);
158 os_get_time(&dst->last_update);
159 dst->last_update.sec -= src->age / 1000;
160 usec = (src->age % 1000) * 1000;
161 --- a/wpa_supplicant/bss.h
162 +++ b/wpa_supplicant/bss.h
163 @@ -56,6 +56,7 @@ struct wpa_bss {
171 --- a/wpa_supplicant/main.c
172 +++ b/wpa_supplicant/main.c
173 @@ -31,7 +31,7 @@ static void usage(void)
175 " wpa_supplicant [-BddhKLqqstuvW] [-P<pid file>] "
176 "[-g<global ctrl>] \\\n"
177 - " -i<ifname> -c<config file> [-C<ctrl>] [-D<driver>] "
178 + " -i<ifname> -c<config file> [-C<ctrl>] [-D<driver>] [-H<hostapd path>]"
179 "[-p<driver_param>] \\\n"
180 " [-b<br_ifname>] [-f<debug file>] \\\n"
181 " [-o<override driver>] [-O<override ctrl>] \\\n"
182 @@ -67,6 +67,7 @@ static void usage(void)
183 #endif /* CONFIG_DEBUG_SYSLOG */
184 printf(" -t = include timestamp in debug messages\n"
185 " -h = show this help text\n"
186 + " -H = connect to a hostapd instance to manage state changes\n"
187 " -L = show license (GPL and BSD)\n"
188 " -o = override driver parameter for new interfaces\n"
189 " -O = override ctrl_interface parameter for new interfaces\n"
190 @@ -143,7 +144,7 @@ int main(int argc, char *argv[])
191 wpa_supplicant_fd_workaround();
194 - c = getopt(argc, argv, "b:Bc:C:D:df:g:hi:KLNo:O:p:P:qstuvW");
195 + c = getopt(argc, argv, "b:Bc:C:D:df:g:hH:i:KLNo:O:p:P:qstuvW");
199 @@ -184,6 +185,9 @@ int main(int argc, char *argv[])
204 + iface->hostapd_ctrl = optarg;
207 iface->ifname = optarg;