hak5
/
wifipineapple-openwrt
mirror of https://github.com/hak5/wifipineapple-openwrt.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

hostapd: fix the scan wait patch for multiple interfaces 

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@35630 3c298f89-4303-0410-b956-a3cf2f4a3e73
master
Felix Fietkau 2013-02-16 19:00:34 +00:00
parent 3becae3332
commit 452522c6de
1 changed files with 13 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
package/network/services/hostapd/patches/620-scan_wait.patch
View File

@ -9,9 +9,9 @@
extern struct wpa_driver_ops *wpa_drivers[]; extern struct wpa_driver_ops *wpa_drivers[];
@@ -279,6 +281,14 @@ static int hostapd_driver_init(struct ho @@ -146,6 +148,14 @@ static void hostapd_logger_cb(void *ctx,
return 0;
} }
#endif /* CONFIG_NO_HOSTAPD_LOGGER */
+static void hostapd_setup_complete_cb(void *ctx) +static void hostapd_setup_complete_cb(void *ctx)
+{ +{
@ -22,25 +22,17 @@
+ daemonize = 0; + daemonize = 0;
+} +}
static struct hostapd_iface * /**
hostapd_interface_init(struct hapd_interfaces *interfaces, * hostapd_init - Allocate and initialize per-interface data
@@ -298,6 +308,7 @@ hostapd_interface_init(struct hapd_inter @@ -189,6 +199,7 @@ static struct hostapd_iface * hostapd_in
iface->bss[0]->conf->logger_stdout_level--; if (hapd == NULL)
goto fail;
hapd->msg_ctx = hapd;
+ hapd->setup_complete_cb = hostapd_setup_complete_cb;
} }
+ iface->bss[0]->setup_complete_cb = hostapd_setup_complete_cb; return hapd_iface;
if (iface->conf->bss[0].iface[0] != 0 || @@ -425,8 +436,6 @@ static void hostapd_global_deinit(const
hostapd_drv_none(iface->bss[0])) {
if (hostapd_driver_init(iface) ||
@@ -310,7 +321,6 @@ hostapd_interface_init(struct hapd_inter
return iface;
}
-
/**
* handle_term - SIGINT and SIGTERM handler to terminate hostapd process
*/
@@ -425,8 +435,6 @@ static void hostapd_global_deinit(const
#endif /* CONFIG_NATIVE_WINDOWS */ #endif /* CONFIG_NATIVE_WINDOWS */
eap_server_unregister_methods(); eap_server_unregister_methods();
@ -49,7 +41,7 @@
} }
@@ -452,11 +460,6 @@ static int hostapd_global_run(struct hap @@ -452,11 +461,6 @@ static int hostapd_global_run(struct hap
} }
#endif /* EAP_SERVER_TNC */ #endif /* EAP_SERVER_TNC */
@ -61,7 +53,7 @@
eloop_run(); eloop_run();
return 0; return 0;
@@ -540,8 +543,7 @@ int main(int argc, char *argv[]) @@ -540,8 +544,7 @@ int main(int argc, char *argv[])
struct hapd_interfaces interfaces; struct hapd_interfaces interfaces;
int ret = 1; int ret = 1;
size_t i; size_t i;