Add patches: - 170-wpa_supplicant-fix-compiling-without-IEEE8021X_EAPOL.patch Remove upstreamed: - 170-DPP-fix-memleak-of-intro.peer_key.patch - 461-driver_nl80211-use-new-parameters-during-ibss-join.patch - 800-acs-don-t-select-indoor-channel-on-outdoor-operation.patch - 992-openssl-include-rsa.patch Automatically refreshed: - 011-mesh-use-deterministic-channel-on-channel-switch.patch - 021-fix-sta-add-after-previous-connection.patch - 022-hostapd-fix-use-of-uninitialized-stack-variables.patch - 030-driver_nl80211-rewrite-neigh-code-to-not-depend-on-l.patch - 040-mesh-allow-processing-authentication-frames-in-block.patch - 050-build_fix.patch - 110-mbedtls-TLS-crypto-option-initial-port.patch - 120-mbedtls-fips186_2_prf.patch - 140-tests-Makefile-make-run-tests-with-CONFIG_TLS.patch - 150-add-NULL-checks-encountered-during-tests-hwsim.patch - 160-dpp_pkex-EC-point-mul-w-value-prime.patch - 200-multicall.patch - 300-noscan.patch - 310-rescan_immediately.patch - 330-nl80211_fix_set_freq.patch - 341-mesh-ctrl-iface-channel-switch.patch - 360-ctrl_iface_reload.patch - 381-hostapd_cli_UNKNOWN-COMMAND.patch - 390-wpa_ie_cap_workaround.patch - 410-limit_debug_messages.patch - 420-indicate-features.patch - 430-hostapd_cli_ifdef.patch - 450-scan_wait.patch - 460-wpa_supplicant-add-new-config-params-to-be-used-with.patch - 463-add-mcast_rate-to-11s.patch - 465-hostapd-config-support-random-BSS-color.patch - 500-lto-jobserver-support.patch - 590-rrm-wnm-statistics.patch - 710-vlan_no_bridge.patch - 720-iface_max_num_sta.patch - 730-ft_iface.patch - 750-qos_map_set_without_interworking.patch - 751-qos_map_ignore_when_unsupported.patch - 760-dynamic_own_ip.patch - 761-shared_das_port.patch - 990-ctrl-make-WNM_AP-functions-dependant-on-CONFIG_AP.patch Manually refresh: - 010-mesh-Allow-DFS-channels-to-be-selected-if-dfs-is-ena.patch - 301-mesh-noscan.patch - 340-reload_freq_change.patch - 350-nl80211_del_beacon_bss.patch - 370-ap_sta_support.patch - 380-disable_ctrl_iface_mib.patch - 464-fix-mesh-obss-check.patch - 470-survey_data_fallback.patch - 600-ubus_support.patch - 700-wifi-reload.patch - 711-wds_bridge_force.patch - 740-snoop_iface.patch Tested-by: Packet Please <pktpls@systemli.org> [Fritzbox 4040 (ipq40xx), EAP225-Outdoor (ath79); 802.11s, WPA3 OWE, and WPA3 PSK] Tested-by: Andrew Sim <andrewsimz@gmail.com> [mediatek/filogic] Signed-off-by: Nick Hainke <vincent@systemli.org>
110 lines
3.5 KiB
Diff
110 lines
3.5 KiB
Diff
--- a/src/ap/ap_config.h
|
|
+++ b/src/ap/ap_config.h
|
|
@@ -310,6 +310,7 @@ struct hostapd_bss_config {
|
|
unsigned int eap_sim_db_timeout;
|
|
int eap_server_erp; /* Whether ERP is enabled on internal EAP server */
|
|
struct hostapd_ip_addr own_ip_addr;
|
|
+ int dynamic_own_ip_addr;
|
|
char *nas_identifier;
|
|
struct hostapd_radius_servers *radius;
|
|
int acct_interim_interval;
|
|
--- a/src/radius/radius_client.c
|
|
+++ b/src/radius/radius_client.c
|
|
@@ -163,6 +163,8 @@ struct radius_client_data {
|
|
*/
|
|
void *ctx;
|
|
|
|
+ struct hostapd_ip_addr local_ip;
|
|
+
|
|
/**
|
|
* conf - RADIUS client configuration (list of RADIUS servers to use)
|
|
*/
|
|
@@ -720,6 +722,30 @@ static void radius_client_list_add(struc
|
|
|
|
|
|
/**
|
|
+ * radius_client_send - Get local address for the RADIUS auth socket
|
|
+ * @radius: RADIUS client context from radius_client_init()
|
|
+ * @addr: pointer to store the address
|
|
+ *
|
|
+ * This function returns the local address for the connection to the RADIUS
|
|
+ * auth server. It also opens the socket if it's not available yet.
|
|
+ */
|
|
+int radius_client_get_local_addr(struct radius_client_data *radius,
|
|
+ struct hostapd_ip_addr *addr)
|
|
+{
|
|
+ struct hostapd_radius_servers *conf = radius->conf;
|
|
+
|
|
+ if (conf->auth_server && radius->auth_sock < 0)
|
|
+ radius_client_init_auth(radius);
|
|
+
|
|
+ if (radius->auth_sock < 0)
|
|
+ return -1;
|
|
+
|
|
+ memcpy(addr, &radius->local_ip, sizeof(*addr));
|
|
+
|
|
+ return 0;
|
|
+}
|
|
+
|
|
+/**
|
|
* radius_client_send - Send a RADIUS request
|
|
* @radius: RADIUS client context from radius_client_init()
|
|
* @msg: RADIUS message to be sent
|
|
@@ -1238,6 +1264,10 @@ radius_change_server(struct radius_clien
|
|
wpa_printf(MSG_DEBUG, "RADIUS local address: %s:%u",
|
|
inet_ntoa(claddr.sin_addr),
|
|
ntohs(claddr.sin_port));
|
|
+ if (auth) {
|
|
+ radius->local_ip.af = AF_INET;
|
|
+ radius->local_ip.u.v4 = claddr.sin_addr;
|
|
+ }
|
|
}
|
|
break;
|
|
#ifdef CONFIG_IPV6
|
|
@@ -1249,6 +1279,10 @@ radius_change_server(struct radius_clien
|
|
inet_ntop(AF_INET6, &claddr6.sin6_addr,
|
|
abuf, sizeof(abuf)),
|
|
ntohs(claddr6.sin6_port));
|
|
+ if (auth) {
|
|
+ radius->local_ip.af = AF_INET6;
|
|
+ radius->local_ip.u.v6 = claddr6.sin6_addr;
|
|
+ }
|
|
}
|
|
break;
|
|
}
|
|
--- a/src/radius/radius_client.h
|
|
+++ b/src/radius/radius_client.h
|
|
@@ -249,6 +249,8 @@ int radius_client_register(struct radius
|
|
void radius_client_set_interim_error_cb(struct radius_client_data *radius,
|
|
void (*cb)(const u8 *addr, void *ctx),
|
|
void *ctx);
|
|
+int radius_client_get_local_addr(struct radius_client_data *radius,
|
|
+ struct hostapd_ip_addr * addr);
|
|
int radius_client_send(struct radius_client_data *radius,
|
|
struct radius_msg *msg,
|
|
RadiusType msg_type, const u8 *addr);
|
|
--- a/src/ap/ieee802_1x.c
|
|
+++ b/src/ap/ieee802_1x.c
|
|
@@ -535,6 +535,10 @@ int add_common_radius_attr(struct hostap
|
|
struct hostapd_radius_attr *attr;
|
|
int len;
|
|
|
|
+ if (hapd->conf->dynamic_own_ip_addr)
|
|
+ radius_client_get_local_addr(hapd->radius,
|
|
+ &hapd->conf->own_ip_addr);
|
|
+
|
|
if (!hostapd_config_get_radius_attr(req_attr,
|
|
RADIUS_ATTR_NAS_IP_ADDRESS) &&
|
|
hapd->conf->own_ip_addr.af == AF_INET &&
|
|
--- a/hostapd/config_file.c
|
|
+++ b/hostapd/config_file.c
|
|
@@ -2688,6 +2688,8 @@ static int hostapd_config_fill(struct ho
|
|
} else if (os_strcmp(buf, "iapp_interface") == 0) {
|
|
wpa_printf(MSG_INFO, "DEPRECATED: iapp_interface not used");
|
|
#endif /* CONFIG_IAPP */
|
|
+ } else if (os_strcmp(buf, "dynamic_own_ip_addr") == 0) {
|
|
+ bss->dynamic_own_ip_addr = atoi(pos);
|
|
} else if (os_strcmp(buf, "own_ip_addr") == 0) {
|
|
if (hostapd_parse_ip_addr(pos, &bss->own_ip_addr)) {
|
|
wpa_printf(MSG_ERROR,
|