From 2f78034c3ef71bdeb1f2955aa8844b1d1ec70d3a Mon Sep 17 00:00:00 2001 From: Koen Vandeputte Date: Tue, 5 Sep 2017 09:56:22 +0200 Subject: hostapd: update to version 2017-08-24 - Deleted upstreamed patches & parts - Refreshed all Compile tested: full-option package + tools (hostapd + wpa_supplicant) Run-tested: hostapd wpa2 hotspot & wpa_supplicant IBSS link Targets: cns3xxx Signed-off-by: Koen Vandeputte --- .../hostapd/patches/600-ubus_support.patch | 70 +++++++++++----------- 1 file changed, 34 insertions(+), 36 deletions(-) (limited to 'package/network/services/hostapd/patches/600-ubus_support.patch') diff --git a/package/network/services/hostapd/patches/600-ubus_support.patch b/package/network/services/hostapd/patches/600-ubus_support.patch index 35c2c13092..86f388997e 100644 --- a/package/network/services/hostapd/patches/600-ubus_support.patch +++ b/package/network/services/hostapd/patches/600-ubus_support.patch @@ -22,7 +22,7 @@ struct wpa_ctrl_dst; struct radius_server_data; -@@ -119,6 +120,7 @@ struct hostapd_data { +@@ -122,6 +123,7 @@ struct hostapd_data { struct hostapd_iface *iface; struct hostapd_config *iconf; struct hostapd_bss_config *conf; @@ -30,7 +30,7 @@ int interface_added; /* virtual interface added for this BSS */ unsigned int started:1; unsigned int disabled:1; -@@ -328,6 +330,8 @@ struct hostapd_iface { +@@ -370,6 +372,8 @@ struct hostapd_iface { struct hostapd_config *conf; char phy[16]; /* Name of the PHY (radio) */ @@ -41,7 +41,7 @@ HAPD_IFACE_DISABLED, --- a/src/ap/hostapd.c +++ b/src/ap/hostapd.c -@@ -302,6 +302,7 @@ static void hostapd_free_hapd_data(struc +@@ -309,6 +309,7 @@ static void hostapd_free_hapd_data(struc hapd->started = 0; wpa_printf(MSG_DEBUG, "%s(%s)", __func__, hapd->conf->iface); @@ -49,7 +49,7 @@ iapp_deinit(hapd->iapp); hapd->iapp = NULL; accounting_deinit(hapd); -@@ -1160,6 +1161,8 @@ static int hostapd_setup_bss(struct host +@@ -1186,6 +1187,8 @@ static int hostapd_setup_bss(struct host if (hapd->driver && hapd->driver->set_operstate) hapd->driver->set_operstate(hapd->drv_priv, 1); @@ -58,7 +58,7 @@ return 0; } -@@ -1683,6 +1686,7 @@ static int hostapd_setup_interface_compl +@@ -1711,6 +1714,7 @@ static int hostapd_setup_interface_compl if (err) goto fail; @@ -66,7 +66,7 @@ wpa_printf(MSG_DEBUG, "Completing interface initialization"); if (iface->conf->channel) { #ifdef NEED_AP_MLME -@@ -1862,6 +1866,7 @@ dfs_offload: +@@ -1890,6 +1894,7 @@ dfs_offload: fail: wpa_printf(MSG_ERROR, "Interface initialization failed"); @@ -74,7 +74,7 @@ hostapd_set_state(iface, HAPD_IFACE_DISABLED); wpa_msg(hapd->msg_ctx, MSG_INFO, AP_EVENT_DISABLED); #ifdef CONFIG_FST -@@ -2310,6 +2315,7 @@ void hostapd_interface_deinit_free(struc +@@ -2344,6 +2349,7 @@ void hostapd_interface_deinit_free(struc (unsigned int) iface->conf->num_bss); driver = iface->bss[0]->driver; drv_priv = iface->bss[0]->drv_priv; @@ -84,7 +84,7 @@ __func__, driver, drv_priv); --- a/src/ap/ieee802_11.c +++ b/src/ap/ieee802_11.c -@@ -1293,7 +1293,8 @@ void ieee802_11_finish_fils_auth(struct +@@ -1587,7 +1587,8 @@ ieee802_11_set_radius_info(struct hostap static void handle_auth(struct hostapd_data *hapd, @@ -94,7 +94,7 @@ { u16 auth_alg, auth_transaction, status_code; u16 resp = WLAN_STATUS_SUCCESS; -@@ -1309,6 +1310,11 @@ static void handle_auth(struct hostapd_d +@@ -1603,6 +1604,11 @@ static void handle_auth(struct hostapd_d char *identity = NULL; char *radius_cui = NULL; u16 seq_ctrl; @@ -104,24 +104,22 @@ + .frame_info = fi, + }; - os_memset(&vlan_id, 0, sizeof(vlan_id)); - -@@ -1466,6 +1472,14 @@ static void handle_auth(struct hostapd_d + if (len < IEEE80211_HDRLEN + sizeof(mgmt->u.auth)) { + wpa_printf(MSG_INFO, "handle_auth - too short payload (len=%lu)", +@@ -1757,6 +1763,12 @@ static void handle_auth(struct hostapd_d resp = WLAN_STATUS_UNSPECIFIED_FAILURE; goto fail; } -+ + if (hostapd_ubus_handle_event(hapd, &req)) { + wpa_printf(MSG_DEBUG, "Station " MACSTR " rejected by ubus handler.\n", -+ MAC2STR(mgmt->sa)); ++ MAC2STR(mgmt->sa)); + resp = WLAN_STATUS_UNSPECIFIED_FAILURE; + goto fail; + } -+ - if (res == HOSTAPD_ACL_PENDING) { - wpa_printf(MSG_DEBUG, "Authentication frame from " MACSTR - " waiting for an external authentication", -@@ -2391,7 +2405,7 @@ static u16 send_assoc_resp(struct hostap + if (res == HOSTAPD_ACL_PENDING) + return; + +@@ -2860,7 +2872,7 @@ void fils_hlp_timeout(void *eloop_ctx, v static void handle_assoc(struct hostapd_data *hapd, const struct ieee80211_mgmt *mgmt, size_t len, @@ -130,10 +128,10 @@ { u16 capab_info, listen_interval, seq_ctrl, fc; u16 resp = WLAN_STATUS_SUCCESS, reply_res; -@@ -2399,6 +2413,11 @@ static void handle_assoc(struct hostapd_ - int left, i; - struct sta_info *sta; - u8 *tmp = NULL; +@@ -2874,6 +2886,11 @@ static void handle_assoc(struct hostapd_ + #ifdef CONFIG_FILS + int delay_assoc = 0; + #endif /* CONFIG_FILS */ + struct hostapd_ubus_request req = { + .type = HOSTAPD_UBUS_ASSOC_REQ, + .mgmt_frame = mgmt, @@ -142,7 +140,7 @@ if (len < IEEE80211_HDRLEN + (reassoc ? sizeof(mgmt->u.reassoc_req) : sizeof(mgmt->u.assoc_req))) { -@@ -2518,6 +2537,13 @@ static void handle_assoc(struct hostapd_ +@@ -3041,6 +3058,13 @@ static void handle_assoc(struct hostapd_ } #endif /* CONFIG_MBO */ @@ -156,7 +154,7 @@ /* * sta->capability is used in check_assoc_ies() for RRM enabled * capability element. -@@ -2688,6 +2714,7 @@ static void handle_disassoc(struct hosta +@@ -3248,6 +3272,7 @@ static void handle_disassoc(struct hosta wpa_printf(MSG_DEBUG, "disassocation: STA=" MACSTR " reason_code=%d", MAC2STR(mgmt->sa), le_to_host16(mgmt->u.disassoc.reason_code)); @@ -164,7 +162,7 @@ sta = ap_get_sta(hapd, mgmt->sa); if (sta == NULL) { -@@ -2742,6 +2769,8 @@ static void handle_deauth(struct hostapd +@@ -3313,6 +3338,8 @@ static void handle_deauth(struct hostapd " reason_code=%d", MAC2STR(mgmt->sa), le_to_host16(mgmt->u.deauth.reason_code)); @@ -173,7 +171,7 @@ sta = ap_get_sta(hapd, mgmt->sa); if (sta == NULL) { wpa_msg(hapd->msg_ctx, MSG_DEBUG, "Station " MACSTR " trying " -@@ -3025,7 +3054,7 @@ int ieee802_11_mgmt(struct hostapd_data +@@ -3627,7 +3654,7 @@ int ieee802_11_mgmt(struct hostapd_data if (stype == WLAN_FC_STYPE_PROBE_REQ) { @@ -182,7 +180,7 @@ return 1; } -@@ -3043,17 +3072,17 @@ int ieee802_11_mgmt(struct hostapd_data +@@ -3647,17 +3674,17 @@ int ieee802_11_mgmt(struct hostapd_data switch (stype) { case WLAN_FC_STYPE_AUTH: wpa_printf(MSG_DEBUG, "mgmt::auth"); @@ -205,7 +203,7 @@ case WLAN_FC_STYPE_DISASSOC: --- a/src/ap/beacon.c +++ b/src/ap/beacon.c -@@ -702,7 +702,7 @@ void sta_track_claim_taxonomy_info(struc +@@ -716,7 +716,7 @@ void sta_track_claim_taxonomy_info(struc void handle_probe_req(struct hostapd_data *hapd, const struct ieee80211_mgmt *mgmt, size_t len, @@ -214,7 +212,7 @@ { u8 *resp; struct ieee802_11_elems elems; -@@ -711,9 +711,15 @@ void handle_probe_req(struct hostapd_dat +@@ -725,9 +725,15 @@ void handle_probe_req(struct hostapd_dat size_t i, resp_len; int noack; enum ssid_match_result res; @@ -230,7 +228,7 @@ if (len < IEEE80211_HDRLEN) return; -@@ -880,6 +886,12 @@ void handle_probe_req(struct hostapd_dat +@@ -894,6 +900,12 @@ void handle_probe_req(struct hostapd_dat } #endif /* CONFIG_P2P */ @@ -256,7 +254,7 @@ int ieee802_11_update_beacons(struct hostapd_iface *iface); --- a/src/ap/drv_callbacks.c +++ b/src/ap/drv_callbacks.c -@@ -52,6 +52,10 @@ int hostapd_notif_assoc(struct hostapd_d +@@ -116,6 +116,10 @@ int hostapd_notif_assoc(struct hostapd_d u16 reason = WLAN_REASON_UNSPECIFIED; u16 status = WLAN_STATUS_SUCCESS; const u8 *p2p_dev_addr = NULL; @@ -267,7 +265,7 @@ if (addr == NULL) { /* -@@ -131,6 +135,12 @@ int hostapd_notif_assoc(struct hostapd_d +@@ -195,6 +199,12 @@ int hostapd_notif_assoc(struct hostapd_d goto fail; } @@ -282,7 +280,7 @@ wpabuf_free(sta->p2p_ie); --- a/src/ap/sta_info.c +++ b/src/ap/sta_info.c -@@ -386,6 +386,7 @@ void ap_handle_timer(void *eloop_ctx, vo +@@ -404,6 +404,7 @@ void ap_handle_timer(void *eloop_ctx, vo HOSTAPD_LEVEL_INFO, "deauthenticated due to " "local deauth request"); ap_free_sta(hapd, sta); @@ -290,7 +288,7 @@ return; } -@@ -533,6 +534,7 @@ skip_poll: +@@ -551,6 +552,7 @@ skip_poll: hapd, sta, WLAN_REASON_PREV_AUTH_NOT_VALID); ap_free_sta(hapd, sta); @@ -300,7 +298,7 @@ } --- a/src/ap/wpa_auth_glue.c +++ b/src/ap/wpa_auth_glue.c -@@ -159,6 +159,7 @@ static void hostapd_wpa_auth_psk_failure +@@ -173,6 +173,7 @@ static void hostapd_wpa_auth_psk_failure struct hostapd_data *hapd = ctx; wpa_msg(hapd->msg_ctx, MSG_INFO, AP_STA_POSSIBLE_PSK_MISMATCH MACSTR, MAC2STR(addr)); -- cgit v1.2.3