BUG/MAJOR: thread/listeners: enable_listener must not call unbind_listener()

unbind_listener() takes the listener lock, which is already held by
enable_listener(). This situation happens when starting with nbproc > 1
with some bind lines limited to a certain process, because in this case
enable_listener() tries to stop unneeded listeners.

This commit introduces __do_unbind_listeners() which must be called with
the lock held, and makes enable_listener() use this one. Given that the
only return code has never been used and that it starts to make the code
more complicated to propagate it before throwing it to the trash, the
function's return type was changed to void.

diff --git a/include/proto/listener.h b/include/proto/listener.h
index 18609537dd82b675f6a92d82525b45e0d116de79..2758a3c7ff7b01204d53dc0b32acf235b8ab94d2 100644 (file)
--- a/include/proto/listener.h
+++ b/include/proto/listener.h
@@ -62,15 +62,15 @@ void dequeue_all_listeners(struct list *list);
 
 /* This function closes the listening socket for the specified listener,
  * provided that it's already in a listening state. The listener enters the
- * LI_ASSIGNED state. It always returns ERR_NONE. This function is intended
- * to be used as a generic function for standard protocols.
+ * LI_ASSIGNED state. This function is intended to be used as a generic
+ * function for standard protocols.
  */
-int unbind_listener(struct listener *listener);
+void unbind_listener(struct listener *listener);
 
 /* This function pretends the listener is dead, but keeps the FD opened, so
  * that we can provide it, for conf reloading.
  */
-int unbind_listener_no_close(struct listener *listener);
+void unbind_listener_no_close(struct listener *listener);
 
 /* This function closes all listening sockets bound to the protocol <proto>,
  * and the listeners end in LI_ASSIGNED state if they were higher. It does not

diff --git a/src/listener.c b/src/listener.c
index 9646bbaaf8ccf367e8c1dbbebda297478d276cb1..c88d76d2736f44b3cb4156b76925cb508c68a746 100644 (file)
--- a/src/listener.c
+++ b/src/listener.c
@@ -50,6 +50,8 @@ static struct bind_kw_list bind_keywords = {
 
 struct xfer_sock_list *xfer_sock_list = NULL;
 
+static void __do_unbind_listener(struct listener *listener, int do_close);
+
 /* This function adds the specified listener's file descriptor to the polling
  * lists if it is in the LI_LISTEN state. The listener enters LI_READY or
  * LI_FULL state depending on its number of connections. In deamon mode, we
@@ -67,9 +69,9 @@ static void enable_listener(struct listener *listener)
                         * want any fd event to reach it.
                         */
                        if (!(global.tune.options & GTUNE_SOCKET_TRANSFER))
-                               unbind_listener(listener);
+                               __do_unbind_listener(listener, 1);
                        else {
-                               unbind_listener_no_close(listener);
+                               __do_unbind_listener(listener, 0);
                                listener->state = LI_LISTEN;
                        }
                }
@@ -307,9 +309,9 @@ void dequeue_all_listeners(struct list *list)
        SPIN_UNLOCK(LISTENER_QUEUE_LOCK, &lq_lock);
 }
 
-static int do_unbind_listener(struct listener *listener, int do_close)
+/* must be called with the lock held */
+static void __do_unbind_listener(struct listener *listener, int do_close)
 {
-       SPIN_LOCK(LISTENER_LOCK, &listener->lock);
        if (listener->state == LI_READY)
                fd_stop_recv(listener->fd);
 
@@ -328,26 +330,31 @@ static int do_unbind_listener(struct listener *listener, int do_close)
                        fd_remove(listener->fd);
                listener->state = LI_ASSIGNED;
        }
+}
+
+static void do_unbind_listener(struct listener *listener, int do_close)
+{
+       SPIN_LOCK(LISTENER_LOCK, &listener->lock);
+       __do_unbind_listener(listener, do_close);
        SPIN_UNLOCK(LISTENER_LOCK, &listener->lock);
-       return ERR_NONE;
 }
 
 /* This function closes the listening socket for the specified listener,
  * provided that it's already in a listening state. The listener enters the
- * LI_ASSIGNED state. It always returns ERR_NONE. This function is intended
- * to be used as a generic function for standard protocols.
+ * LI_ASSIGNED state. This function is intended to be used as a generic
+ * function for standard protocols.
  */
-int unbind_listener(struct listener *listener)
+void unbind_listener(struct listener *listener)
 {
-       return do_unbind_listener(listener, 1);
+       do_unbind_listener(listener, 1);
 }
 
 /* This function pretends the listener is dead, but keeps the FD opened, so
  * that we can provide it, for conf reloading.
  */
-int unbind_listener_no_close(struct listener *listener)
+void unbind_listener_no_close(struct listener *listener)
 {
-       return do_unbind_listener(listener, 0);
+       do_unbind_listener(listener, 0);
 }
 
 /* This function closes all listening sockets bound to the protocol <proto>,