mt76: update to the latest version, adds support for 802.11w
[openwrt/openwrt.git] / package / network / services / hostapd / patches / 600-ubus_support.patch
1 --- a/hostapd/Makefile
2 +++ b/hostapd/Makefile
3 @@ -165,6 +165,11 @@ OBJS += ../src/common/hw_features_common
4
5 OBJS += ../src/eapol_auth/eapol_auth_sm.o
6
7 +ifdef CONFIG_UBUS
8 +CFLAGS += -DUBUS_SUPPORT
9 +OBJS += ../src/ap/ubus.o
10 +LIBS += -lubox -lubus
11 +endif
12
13 ifdef CONFIG_CODE_COVERAGE
14 CFLAGS += -O0 -fprofile-arcs -ftest-coverage
15 --- a/src/ap/hostapd.h
16 +++ b/src/ap/hostapd.h
17 @@ -13,6 +13,7 @@
18 #include "utils/list.h"
19 #include "ap_config.h"
20 #include "drivers/driver.h"
21 +#include "ubus.h"
22
23 struct wpa_ctrl_dst;
24 struct radius_server_data;
25 @@ -119,6 +120,7 @@ struct hostapd_data {
26 struct hostapd_iface *iface;
27 struct hostapd_config *iconf;
28 struct hostapd_bss_config *conf;
29 + struct hostapd_ubus_bss ubus;
30 int interface_added; /* virtual interface added for this BSS */
31 unsigned int started:1;
32 unsigned int disabled:1;
33 @@ -328,6 +330,8 @@ struct hostapd_iface {
34 struct hostapd_config *conf;
35 char phy[16]; /* Name of the PHY (radio) */
36
37 + struct hostapd_ubus_iface ubus;
38 +
39 enum hostapd_iface_state {
40 HAPD_IFACE_UNINITIALIZED,
41 HAPD_IFACE_DISABLED,
42 --- a/src/ap/hostapd.c
43 +++ b/src/ap/hostapd.c
44 @@ -284,6 +284,7 @@ static void hostapd_free_hapd_data(struc
45 hapd->started = 0;
46
47 wpa_printf(MSG_DEBUG, "%s(%s)", __func__, hapd->conf->iface);
48 + hostapd_ubus_free_bss(hapd);
49 iapp_deinit(hapd->iapp);
50 hapd->iapp = NULL;
51 accounting_deinit(hapd);
52 @@ -1142,6 +1143,8 @@ static int hostapd_setup_bss(struct host
53 if (hapd->driver && hapd->driver->set_operstate)
54 hapd->driver->set_operstate(hapd->drv_priv, 1);
55
56 + hostapd_ubus_add_bss(hapd);
57 +
58 return 0;
59 }
60
61 @@ -1665,6 +1668,7 @@ static int hostapd_setup_interface_compl
62 if (err)
63 goto fail;
64
65 + hostapd_ubus_add_iface(iface);
66 wpa_printf(MSG_DEBUG, "Completing interface initialization");
67 if (iface->conf->channel) {
68 #ifdef NEED_AP_MLME
69 @@ -1844,6 +1848,7 @@ dfs_offload:
70
71 fail:
72 wpa_printf(MSG_ERROR, "Interface initialization failed");
73 + hostapd_ubus_free_iface(iface);
74 hostapd_set_state(iface, HAPD_IFACE_DISABLED);
75 wpa_msg(hapd->msg_ctx, MSG_INFO, AP_EVENT_DISABLED);
76 #ifdef CONFIG_FST
77 @@ -2292,6 +2297,7 @@ void hostapd_interface_deinit_free(struc
78 (unsigned int) iface->conf->num_bss);
79 driver = iface->bss[0]->driver;
80 drv_priv = iface->bss[0]->drv_priv;
81 + hostapd_ubus_free_iface(iface);
82 hostapd_interface_deinit(iface);
83 wpa_printf(MSG_DEBUG, "%s: driver=%p drv_priv=%p -> hapd_deinit",
84 __func__, driver, drv_priv);
85 --- a/src/ap/ieee802_11.c
86 +++ b/src/ap/ieee802_11.c
87 @@ -1293,7 +1293,8 @@ void ieee802_11_finish_fils_auth(struct
88
89
90 static void handle_auth(struct hostapd_data *hapd,
91 - const struct ieee80211_mgmt *mgmt, size_t len)
92 + const struct ieee80211_mgmt *mgmt, size_t len,
93 + struct hostapd_frame_info *fi)
94 {
95 u16 auth_alg, auth_transaction, status_code;
96 u16 resp = WLAN_STATUS_SUCCESS;
97 @@ -1309,6 +1310,11 @@ static void handle_auth(struct hostapd_d
98 char *identity = NULL;
99 char *radius_cui = NULL;
100 u16 seq_ctrl;
101 + struct hostapd_ubus_request req = {
102 + .type = HOSTAPD_UBUS_AUTH_REQ,
103 + .mgmt_frame = mgmt,
104 + .frame_info = fi,
105 + };
106
107 os_memset(&vlan_id, 0, sizeof(vlan_id));
108
109 @@ -1466,6 +1472,14 @@ static void handle_auth(struct hostapd_d
110 resp = WLAN_STATUS_UNSPECIFIED_FAILURE;
111 goto fail;
112 }
113 +
114 + if (hostapd_ubus_handle_event(hapd, &req)) {
115 + wpa_printf(MSG_DEBUG, "Station " MACSTR " rejected by ubus handler.\n",
116 + MAC2STR(mgmt->sa));
117 + resp = WLAN_STATUS_UNSPECIFIED_FAILURE;
118 + goto fail;
119 + }
120 +
121 if (res == HOSTAPD_ACL_PENDING) {
122 wpa_printf(MSG_DEBUG, "Authentication frame from " MACSTR
123 " waiting for an external authentication",
124 @@ -2391,7 +2405,7 @@ static u16 send_assoc_resp(struct hostap
125
126 static void handle_assoc(struct hostapd_data *hapd,
127 const struct ieee80211_mgmt *mgmt, size_t len,
128 - int reassoc)
129 + int reassoc, struct hostapd_frame_info *fi)
130 {
131 u16 capab_info, listen_interval, seq_ctrl, fc;
132 u16 resp = WLAN_STATUS_SUCCESS, reply_res;
133 @@ -2399,6 +2413,11 @@ static void handle_assoc(struct hostapd_
134 int left, i;
135 struct sta_info *sta;
136 u8 *tmp = NULL;
137 + struct hostapd_ubus_request req = {
138 + .type = HOSTAPD_UBUS_ASSOC_REQ,
139 + .mgmt_frame = mgmt,
140 + .frame_info = fi,
141 + };
142
143 if (len < IEEE80211_HDRLEN + (reassoc ? sizeof(mgmt->u.reassoc_req) :
144 sizeof(mgmt->u.assoc_req))) {
145 @@ -2518,6 +2537,13 @@ static void handle_assoc(struct hostapd_
146 }
147 #endif /* CONFIG_MBO */
148
149 + if (hostapd_ubus_handle_event(hapd, &req)) {
150 + wpa_printf(MSG_DEBUG, "Station " MACSTR " assoc rejected by ubus handler.\n",
151 + MAC2STR(mgmt->sa));
152 + resp = WLAN_STATUS_UNSPECIFIED_FAILURE;
153 + goto fail;
154 + }
155 +
156 /*
157 * sta->capability is used in check_assoc_ies() for RRM enabled
158 * capability element.
159 @@ -3023,7 +3049,7 @@ int ieee802_11_mgmt(struct hostapd_data
160
161
162 if (stype == WLAN_FC_STYPE_PROBE_REQ) {
163 - handle_probe_req(hapd, mgmt, len, fi->ssi_signal);
164 + handle_probe_req(hapd, mgmt, len, fi);
165 return 1;
166 }
167
168 @@ -3041,17 +3067,17 @@ int ieee802_11_mgmt(struct hostapd_data
169 switch (stype) {
170 case WLAN_FC_STYPE_AUTH:
171 wpa_printf(MSG_DEBUG, "mgmt::auth");
172 - handle_auth(hapd, mgmt, len);
173 + handle_auth(hapd, mgmt, len, fi);
174 ret = 1;
175 break;
176 case WLAN_FC_STYPE_ASSOC_REQ:
177 wpa_printf(MSG_DEBUG, "mgmt::assoc_req");
178 - handle_assoc(hapd, mgmt, len, 0);
179 + handle_assoc(hapd, mgmt, len, 0, fi);
180 ret = 1;
181 break;
182 case WLAN_FC_STYPE_REASSOC_REQ:
183 wpa_printf(MSG_DEBUG, "mgmt::reassoc_req");
184 - handle_assoc(hapd, mgmt, len, 1);
185 + handle_assoc(hapd, mgmt, len, 1, fi);
186 ret = 1;
187 break;
188 case WLAN_FC_STYPE_DISASSOC:
189 --- a/src/ap/beacon.c
190 +++ b/src/ap/beacon.c
191 @@ -702,7 +702,7 @@ void sta_track_claim_taxonomy_info(struc
192
193 void handle_probe_req(struct hostapd_data *hapd,
194 const struct ieee80211_mgmt *mgmt, size_t len,
195 - int ssi_signal)
196 + struct hostapd_frame_info *fi)
197 {
198 u8 *resp;
199 struct ieee802_11_elems elems;
200 @@ -711,9 +711,15 @@ void handle_probe_req(struct hostapd_dat
201 size_t i, resp_len;
202 int noack;
203 enum ssid_match_result res;
204 + int ssi_signal = fi->ssi_signal;
205 int ret;
206 u16 csa_offs[2];
207 size_t csa_offs_len;
208 + struct hostapd_ubus_request req = {
209 + .type = HOSTAPD_UBUS_PROBE_REQ,
210 + .mgmt_frame = mgmt,
211 + .frame_info = fi,
212 + };
213
214 if (len < IEEE80211_HDRLEN)
215 return;
216 @@ -880,6 +886,12 @@ void handle_probe_req(struct hostapd_dat
217 }
218 #endif /* CONFIG_P2P */
219
220 + if (hostapd_ubus_handle_event(hapd, &req)) {
221 + wpa_printf(MSG_DEBUG, "Probe request for " MACSTR " rejected by ubus handler.\n",
222 + MAC2STR(mgmt->sa));
223 + return;
224 + }
225 +
226 /* TODO: verify that supp_rates contains at least one matching rate
227 * with AP configuration */
228
229 --- a/src/ap/beacon.h
230 +++ b/src/ap/beacon.h
231 @@ -14,7 +14,7 @@ struct ieee80211_mgmt;
232
233 void handle_probe_req(struct hostapd_data *hapd,
234 const struct ieee80211_mgmt *mgmt, size_t len,
235 - int ssi_signal);
236 + struct hostapd_frame_info *fi);
237 int ieee802_11_set_beacon(struct hostapd_data *hapd);
238 int ieee802_11_set_beacons(struct hostapd_iface *iface);
239 int ieee802_11_update_beacons(struct hostapd_iface *iface);
240 --- a/src/ap/drv_callbacks.c
241 +++ b/src/ap/drv_callbacks.c
242 @@ -52,6 +52,10 @@ int hostapd_notif_assoc(struct hostapd_d
243 u16 reason = WLAN_REASON_UNSPECIFIED;
244 u16 status = WLAN_STATUS_SUCCESS;
245 const u8 *p2p_dev_addr = NULL;
246 + struct hostapd_ubus_request req = {
247 + .type = HOSTAPD_UBUS_ASSOC_REQ,
248 + .addr = addr,
249 + };
250
251 if (addr == NULL) {
252 /*
253 @@ -131,6 +135,12 @@ int hostapd_notif_assoc(struct hostapd_d
254 goto fail;
255 }
256
257 + if (hostapd_ubus_handle_event(hapd, &req)) {
258 + wpa_printf(MSG_DEBUG, "Station " MACSTR " assoc rejected by ubus handler.\n",
259 + MAC2STR(req.addr));
260 + goto fail;
261 + }
262 +
263 #ifdef CONFIG_P2P
264 if (elems.p2p) {
265 wpabuf_free(sta->p2p_ie);