director: Support multiple proxy-notify connections

diff --git a/src/director/main.c b/src/director/main.c
index 1e1a7ac64dea98b1d12e79bee5122d7b8d643c9b..d51ebbc917a017ce9c1e4965b9bb954591d276a6 100644 (file)
--- a/src/director/main.c
+++ b/src/director/main.c
@@ -36,7 +36,6 @@ enum director_socket_type {
 };
 
 static struct director *director;
-static struct notify_connection *notify_conn;
 static struct timeout *to_proctitle_refresh;
 static ARRAY(enum director_socket_type) listener_socket_types;
 
@@ -181,12 +180,8 @@ static void client_connected(struct master_service_connection *conn)
        bool userdb;
 
        if (conn->fifo) {
-               if (notify_conn != NULL) {
-                       i_error("Received another proxy-notify connection");
-                       return;
-               }
                master_service_client_connection_accept(conn);
-               notify_conn = notify_connection_init(director, conn->fd);
+               notify_connection_init(director, conn->fd);
                return;
        }
 
@@ -298,8 +293,7 @@ static void main_deinit(void)
 {
        if (to_proctitle_refresh != NULL)
                timeout_remove(&to_proctitle_refresh);
-       if (notify_conn != NULL)
-               notify_connection_deinit(&notify_conn);
+       notify_connections_deinit();
        /* deinit doveadm connections before director, so it can clean up
           its pending work, such as abort user moves. */
        doveadm_connections_deinit();

diff --git a/src/director/notify-connection.c b/src/director/notify-connection.c
index 9a91737b90f3669260d8d10d2e6cda9973ed7884..2ba62addb7f990cac1fe5e01e37f1b357e084bb6 100644 (file)
--- a/src/director/notify-connection.c
+++ b/src/director/notify-connection.c
@@ -2,6 +2,7 @@
 
 #include "lib.h"
 #include "array.h"
+#include "llist.h"
 #include "ioloop.h"
 #include "istream.h"
 #include "master-service.h"
@@ -12,12 +13,18 @@
 #include <unistd.h>
 
 struct notify_connection {
+       struct notify_connection *prev, *next;
+
        int fd;
        struct io *io;
        struct istream *input;
        struct director *dir;
 };
 
+static struct notify_connection *notify_connections = NULL;
+
+static void notify_connection_deinit(struct notify_connection **_conn);
+
 static void notify_update_user(struct director *dir, struct mail_tag *tag,
                               const char *username, unsigned int username_hash)
 {
@@ -58,8 +65,7 @@ static void notify_connection_input(struct notify_connection *conn)
        }
 }
 
-struct notify_connection *
-notify_connection_init(struct director *dir, int fd)
+void notify_connection_init(struct director *dir, int fd)
 {
        struct notify_connection *conn;
 
@@ -68,18 +74,27 @@ notify_connection_init(struct director *dir, int fd)
        conn->dir = dir;
        conn->input = i_stream_create_fd(conn->fd, 1024, FALSE);
        conn->io = io_add(conn->fd, IO_READ, notify_connection_input, conn);
-       return conn;
+       DLLIST_PREPEND(&notify_connections, conn);
 }
 
-void notify_connection_deinit(struct notify_connection **_conn)
+static void notify_connection_deinit(struct notify_connection **_conn)
 {
        struct notify_connection *conn = *_conn;
 
        *_conn = NULL;
 
+       DLLIST_REMOVE(&notify_connections, conn);
        io_remove(&conn->io);
        i_stream_unref(&conn->input);
        if (close(conn->fd) < 0)
                i_error("close(notify connection) failed: %m");
        i_free(conn);
 }
+
+void notify_connections_deinit(void)
+{
+       while (notify_connections != NULL) {
+               struct notify_connection *conn = notify_connections;
+               notify_connection_deinit(&conn);
+       }
+}

diff --git a/src/director/notify-connection.h b/src/director/notify-connection.h
index cb6217015e13a69c1d7b7d5945c309391e780297..1a0d09e62829d42e7dc73b4113c360773fa8b323 100644 (file)
--- a/src/director/notify-connection.h
+++ b/src/director/notify-connection.h
@@ -3,7 +3,7 @@
 
 struct director;
 
-struct notify_connection *notify_connection_init(struct director *dir, int fd);
-void notify_connection_deinit(struct notify_connection **conn);
+void notify_connection_init(struct director *dir, int fd);
+void notify_connections_deinit(void);
 
 #endif