mirror of
https://github.com/openwrt/openwrt.git
synced 2024-12-30 02:29:01 +00:00
304423a4ff
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>
74 lines
1.6 KiB
Diff
74 lines
1.6 KiB
Diff
--- a/hostapd/main.c
|
|
+++ b/hostapd/main.c
|
|
@@ -39,6 +39,8 @@ struct hapd_global {
|
|
};
|
|
|
|
static struct hapd_global global;
|
|
+static int daemonize = 0;
|
|
+static char *pid_file = NULL;
|
|
|
|
|
|
#ifndef CONFIG_NO_HOSTAPD_LOGGER
|
|
@@ -146,6 +148,14 @@ static void hostapd_logger_cb(void *ctx,
|
|
}
|
|
#endif /* CONFIG_NO_HOSTAPD_LOGGER */
|
|
|
|
+static void hostapd_setup_complete_cb(void *ctx)
|
|
+{
|
|
+ if (daemonize && os_daemonize(pid_file)) {
|
|
+ perror("daemon");
|
|
+ return;
|
|
+ }
|
|
+ daemonize = 0;
|
|
+}
|
|
|
|
/**
|
|
* hostapd_driver_init - Preparate driver interface
|
|
@@ -164,6 +174,8 @@ static int hostapd_driver_init(struct ho
|
|
return -1;
|
|
}
|
|
|
|
+ hapd->setup_complete_cb = hostapd_setup_complete_cb;
|
|
+
|
|
/* Initialize the driver interface */
|
|
if (!(b[0] | b[1] | b[2] | b[3] | b[4] | b[5]))
|
|
b = NULL;
|
|
@@ -407,8 +419,6 @@ static void hostapd_global_deinit(const
|
|
#endif /* CONFIG_NATIVE_WINDOWS */
|
|
|
|
eap_server_unregister_methods();
|
|
-
|
|
- os_daemonize_terminate(pid_file);
|
|
}
|
|
|
|
|
|
@@ -434,18 +444,6 @@ static int hostapd_global_run(struct hap
|
|
}
|
|
#endif /* EAP_SERVER_TNC */
|
|
|
|
- if (daemonize) {
|
|
- if (os_daemonize(pid_file)) {
|
|
- wpa_printf(MSG_ERROR, "daemon: %s", strerror(errno));
|
|
- return -1;
|
|
- }
|
|
- if (eloop_sock_requeue()) {
|
|
- wpa_printf(MSG_ERROR, "eloop_sock_requeue: %s",
|
|
- strerror(errno));
|
|
- return -1;
|
|
- }
|
|
- }
|
|
-
|
|
eloop_run();
|
|
|
|
return 0;
|
|
@@ -649,8 +647,7 @@ int main(int argc, char *argv[])
|
|
struct hapd_interfaces interfaces;
|
|
int ret = 1;
|
|
size_t i, j;
|
|
- int c, debug = 0, daemonize = 0;
|
|
- char *pid_file = NULL;
|
|
+ int c, debug = 0;
|
|
const char *log_file = NULL;
|
|
const char *entropy_file = NULL;
|
|
char **bss_config = NULL, **tmp_bss;
|