eloop: Add eloop_sock_requeue()

This function can be used to re-build eloop socket tables after forking
for eloop implementations that need this.

Signed-off-by: Roy Marples <roy@marples.name>

diff --git a/hostapd/hostapd_cli.c b/hostapd/hostapd_cli.c
index 52dfc9f33996fadf59b815719acea81c9b6e538b..7e6ac23754248a6ec6eb25e9aa4ea92089e09abe 100644 (file)
--- a/hostapd/hostapd_cli.c
+++ b/hostapd/hostapd_cli.c
@@ -1444,7 +1444,7 @@ int main(int argc, char *argv[])
                }
        }
 
-       if (daemonize && os_daemonize(pid_file))
+       if (daemonize && os_daemonize(pid_file) && eloop_sock_requeue())
                return -1;
 
        if (interactive)

diff --git a/hostapd/main.c b/hostapd/main.c
index 4913cbdef959dfcb2e0cc2c7661f2113c3c8485a..1b9002cf2523d751accb8a099d473b31e283708f 100644 (file)
--- a/hostapd/main.c
+++ b/hostapd/main.c
@@ -408,9 +408,16 @@ static int hostapd_global_run(struct hapd_interfaces *ifaces, int daemonize,
        }
 #endif /* EAP_SERVER_TNC */
 
-       if (daemonize && os_daemonize(pid_file)) {
-               wpa_printf(MSG_ERROR, "daemon: %s", strerror(errno));
-               return -1;
+       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();

diff --git a/src/utils/eloop.c b/src/utils/eloop.c
index 8647229b8eb5ff4c95ab56246b87f736e0039202..fda1a83e48b075a474ccbaa26c5b546ccc8368fc 100644 (file)
--- a/src/utils/eloop.c
+++ b/src/utils/eloop.c
@@ -525,6 +525,12 @@ static void eloop_sock_table_dispatch(struct epoll_event *events, int nfds)
 #endif /* CONFIG_ELOOP_EPOLL */
 
 
+int eloop_sock_requeue(void)
+{
+       return 0;
+}
+
+
 static void eloop_sock_table_destroy(struct eloop_sock_table *table)
 {
        if (table) {

diff --git a/src/utils/eloop.h b/src/utils/eloop.h
index 07b8c0dc3352000d4dda90fc246f1c1640822add..97af16f0130aa4aa1b1cfbc7ef7a5944baea3778 100644 (file)
--- a/src/utils/eloop.h
+++ b/src/utils/eloop.h
@@ -312,6 +312,14 @@ int eloop_register_signal_terminate(eloop_signal_handler handler,
 int eloop_register_signal_reconfig(eloop_signal_handler handler,
                                   void *user_data);
 
+/**
+ * eloop_sock_requeue - Requeue sockets
+ *
+ * Requeue sockets after forking because some implementations require this,
+ * such as epoll and kqueue.
+ */
+int eloop_sock_requeue(void);
+
 /**
  * eloop_run - Start the event loop
  *

diff --git a/src/utils/eloop_win.c b/src/utils/eloop_win.c
index de47fb21837c249be0dc55b95c2103d4b71eb328..9c8b12be8ad80d3146ec0836725e66a1d9e0b13d 100644 (file)
--- a/src/utils/eloop_win.c
+++ b/src/utils/eloop_win.c
@@ -692,3 +692,9 @@ void eloop_wait_for_read_sock(int sock)
        WSAEventSelect(sock, event, 0);
        WSACloseEvent(event);
 }
+
+
+int eloop_sock_requeue(void)
+{
+       return 0;
+}

diff --git a/wpa_supplicant/wpa_cli.c b/wpa_supplicant/wpa_cli.c
index 1aea0a65659755b2af4f5b262854e004f78378b6..265f72c990fb21bf3e72620c1b3dcdaa6013a99f 100644 (file)
--- a/wpa_supplicant/wpa_cli.c
+++ b/wpa_supplicant/wpa_cli.c
@@ -4441,7 +4441,7 @@ int main(int argc, char *argv[])
                        }
                }
 
-               if (daemonize && os_daemonize(pid_file))
+               if (daemonize && os_daemonize(pid_file) && eloop_sock_requeue())
                        return -1;
 
                if (action_file)

diff --git a/wpa_supplicant/wpa_priv.c b/wpa_supplicant/wpa_priv.c
index fa5a6ded5ec69f862f60e34add7cd673443dd7a4..3f91cc16aa1422e8d5c2719b1f66c4da1468e5e8 100644 (file)
--- a/wpa_supplicant/wpa_priv.c
+++ b/wpa_supplicant/wpa_priv.c
@@ -1128,7 +1128,7 @@ int main(int argc, char *argv[])
                interfaces = iface;
        }
 
-       if (daemonize && os_daemonize(pid_file))
+       if (daemonize && os_daemonize(pid_file) && eloop_sock_requeue())
                goto out;
 
        eloop_register_signal_terminate(wpa_priv_terminate, NULL);

diff --git a/wpa_supplicant/wpa_supplicant.c b/wpa_supplicant/wpa_supplicant.c
index 03b135332a251377fa5e18c4fd2ee98614dd7be8..c3c1f147264b1be732bfde4b0eca5c492e2002b3 100644 (file)
--- a/wpa_supplicant/wpa_supplicant.c
+++ b/wpa_supplicant/wpa_supplicant.c
@@ -5221,7 +5221,8 @@ int wpa_supplicant_run(struct wpa_global *global)
        struct wpa_supplicant *wpa_s;
 
        if (global->params.daemonize &&
-           wpa_supplicant_daemon(global->params.pid_file))
+           (wpa_supplicant_daemon(global->params.pid_file) ||
+            eloop_sock_requeue()))
                return -1;
 
        if (global->params.wait_for_monitor) {