package/network/services/hostapd/patches/600-ubus_support.patch

   1 --- a/hostapd/Makefile
   2 +++ b/hostapd/Makefile
   3 @@ -160,6 +160,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 @@ -118,6 +119,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 @@ -323,6 +325,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 @@ -1140,6 +1141,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 @@ -1845,6 +1849,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 @@ -2279,6 +2284,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 @@ -980,7 +980,8 @@ int auth_sae_init_committed(struct hosta
  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 @@ -996,6 +997,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 @@ -1149,6 +1155,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 @@ -2052,13 +2066,18 @@ 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         const u8 *pos;
 134         int left, i;
 135         struct sta_info *sta;
 136 +       struct hostapd_ubus_request req = {
 137 +               .type = HOSTAPD_UBUS_ASSOC_REQ,
 138 +               .mgmt_frame = mgmt,
 139 +               .frame_info = fi,
 140 +       };
 141
 142         if (len < IEEE80211_HDRLEN + (reassoc ? sizeof(mgmt->u.reassoc_req) :
 143                                       sizeof(mgmt->u.assoc_req))) {
 144 @@ -2178,6 +2197,13 @@ static void handle_assoc(struct hostapd_
 145         }
 146  #endif /* CONFIG_MBO */
 147
 148 +       if (hostapd_ubus_handle_event(hapd, &req)) {
 149 +               wpa_printf(MSG_DEBUG, "Station " MACSTR " assoc rejected by ubus handler.\n",
 150 +                      MAC2STR(mgmt->sa));
 151 +               resp = WLAN_STATUS_UNSPECIFIED_FAILURE;
 152 +               goto fail;
 153 +       }
 154 +
 155         /*
 156          * sta->capability is used in check_assoc_ies() for RRM enabled
 157          * capability element.
 158 @@ -2654,7 +2680,7 @@ int ieee802_11_mgmt(struct hostapd_data
 159
 160
 161         if (stype == WLAN_FC_STYPE_PROBE_REQ) {
 162 -               handle_probe_req(hapd, mgmt, len, fi->ssi_signal);
 163 +               handle_probe_req(hapd, mgmt, len, fi);
 164                 return 1;
 165         }
 166
 167 @@ -2672,17 +2698,17 @@ int ieee802_11_mgmt(struct hostapd_data
 168         switch (stype) {
 169         case WLAN_FC_STYPE_AUTH:
 170                 wpa_printf(MSG_DEBUG, "mgmt::auth");
 171 -               handle_auth(hapd, mgmt, len);
 172 +               handle_auth(hapd, mgmt, len, fi);
 173                 ret = 1;
 174                 break;
 175         case WLAN_FC_STYPE_ASSOC_REQ:
 176                 wpa_printf(MSG_DEBUG, "mgmt::assoc_req");
 177 -               handle_assoc(hapd, mgmt, len, 0);
 178 +               handle_assoc(hapd, mgmt, len, 0, fi);
 179                 ret = 1;
 180                 break;
 181         case WLAN_FC_STYPE_REASSOC_REQ:
 182                 wpa_printf(MSG_DEBUG, "mgmt::reassoc_req");
 183 -               handle_assoc(hapd, mgmt, len, 1);
 184 +               handle_assoc(hapd, mgmt, len, 1, fi);
 185                 ret = 1;
 186                 break;
 187         case WLAN_FC_STYPE_DISASSOC:
 188 --- a/src/ap/beacon.c
 189 +++ b/src/ap/beacon.c
 190 @@ -675,7 +675,7 @@ sta_track_seen_on(struct hostapd_iface *
 191
 192  void handle_probe_req(struct hostapd_data *hapd,
 193                       const struct ieee80211_mgmt *mgmt, size_t len,
 194 -                     int ssi_signal)
 195 +                     struct hostapd_frame_info *fi)
 196  {
 197         u8 *resp;
 198         struct ieee802_11_elems elems;
 199 @@ -684,9 +684,15 @@ void handle_probe_req(struct hostapd_dat
 200         size_t i, resp_len;
 201         int noack;
 202         enum ssid_match_result res;
 203 +       int ssi_signal = fi->ssi_signal;
 204         int ret;
 205         u16 csa_offs[2];
 206         size_t csa_offs_len;
 207 +       struct hostapd_ubus_request req = {
 208 +               .type = HOSTAPD_UBUS_PROBE_REQ,
 209 +               .mgmt_frame = mgmt,
 210 +               .frame_info = fi,
 211 +       };
 212
 213         if (len < IEEE80211_HDRLEN)
 214                 return;
 215 @@ -838,6 +844,12 @@ void handle_probe_req(struct hostapd_dat
 216         }
 217  #endif /* CONFIG_P2P */
 218
 219 +       if (hostapd_ubus_handle_event(hapd, &req)) {
 220 +               wpa_printf(MSG_DEBUG, "Probe request for " MACSTR " rejected by ubus handler.\n",
 221 +                      MAC2STR(mgmt->sa));
 222 +               return;
 223 +       }
 224 +
 225         /* TODO: verify that supp_rates contains at least one matching rate
 226          * with AP configuration */
 227
 228 --- a/src/ap/beacon.h
 229 +++ b/src/ap/beacon.h
 230 @@ -14,7 +14,7 @@ struct ieee80211_mgmt;
 231
 232  void handle_probe_req(struct hostapd_data *hapd,
 233                       const struct ieee80211_mgmt *mgmt, size_t len,
 234 -                     int ssi_signal);
 235 +                     struct hostapd_frame_info *fi);
 236  int ieee802_11_set_beacon(struct hostapd_data *hapd);
 237  int ieee802_11_set_beacons(struct hostapd_iface *iface);
 238  int ieee802_11_update_beacons(struct hostapd_iface *iface);
 239 --- a/src/ap/drv_callbacks.c
 240 +++ b/src/ap/drv_callbacks.c
 241 @@ -52,6 +52,10 @@ int hostapd_notif_assoc(struct hostapd_d
 242         u16 reason = WLAN_REASON_UNSPECIFIED;
 243         u16 status = WLAN_STATUS_SUCCESS;
 244         const u8 *p2p_dev_addr = NULL;
 245 +       struct hostapd_ubus_request req = {
 246 +               .type = HOSTAPD_UBUS_ASSOC_REQ,
 247 +               .addr = addr,
 248 +       };
 249
 250         if (addr == NULL) {
 251                 /*
 252 @@ -131,6 +135,12 @@ int hostapd_notif_assoc(struct hostapd_d
 253                 goto fail;
 254         }
 255
 256 +       if (hostapd_ubus_handle_event(hapd, &req)) {
 257 +               wpa_printf(MSG_DEBUG, "Station " MACSTR " assoc rejected by ubus handler.\n",
 258 +                          MAC2STR(req.addr));
 259 +               goto fail;
 260 +       }
 261 +
 262  #ifdef CONFIG_P2P
 263         if (elems.p2p) {
 264                 wpabuf_free(sta->p2p_ie);