lib-master: Moved connection accepting code to its own functions.

No functional changes.

diff --git a/src/lib-master/master-service-private.h b/src/lib-master/master-service-private.h
index bae6b6833ae3f39a186ecff957606ac39a98d9d4..0d4354195ea37b5d23b7ed8421dd105fd511855d 100644 (file)
--- a/src/lib-master/master-service-private.h
+++ b/src/lib-master/master-service-private.h
@@ -83,4 +83,9 @@ void master_service_close_config_fd(struct master_service *service);
 void master_service_io_listeners_remove(struct master_service *service);
 void master_service_ssl_io_listeners_remove(struct master_service *service);
 
+void master_service_client_connection_handled(struct master_service *service,
+                                             struct master_service_connection *conn);
+void master_service_client_connection_callback(struct master_service *service,
+                                              struct master_service_connection *conn);
+
 #endif

diff --git a/src/lib-master/master-service.c b/src/lib-master/master-service.c
index eac7d3d1af8cf270754f49c7bb0bbb7925e32072..116d3f3d0e892abf7ec586e3ef96b67395519094 100644 (file)
--- a/src/lib-master/master-service.c
+++ b/src/lib-master/master-service.c
@@ -680,6 +680,38 @@ void master_service_client_connection_created(struct master_service *service)
        master_status_update(service);
 }
 
+void master_service_client_connection_handled(struct master_service *service,
+                                             struct master_service_connection *conn)
+{
+       if (!conn->accepted) {
+               if (close(conn->fd) < 0)
+                       i_error("close(service connection) failed: %m");
+               master_service_client_connection_destroyed(service);
+       } else if (conn->fifo) {
+               /* reading FIFOs stays open forever, don't count them
+                  as real clients */
+               master_service_client_connection_destroyed(service);
+       }
+       if (service->master_status.available_count == 0 &&
+           service->service_count_left == 1) {
+               /* we're not going to accept any more connections after this.
+                  go ahead and close the connection early. don't do this
+                  before calling callback, because it may want to access
+                  the listen_fd (e.g. to check socket permissions). */
+               i_assert(service->listeners != NULL);
+               master_service_io_listeners_remove(service);
+               master_service_io_listeners_close(service);
+       }
+}
+
+void master_service_client_connection_callback(struct master_service *service,
+                                              struct master_service_connection *conn)
+{
+       service->callback(conn);
+
+       master_service_client_connection_handled(service, conn);
+}
+
 void master_service_client_connection_accept(struct master_service_connection *conn)
 {
        conn->accepted = TRUE;
@@ -870,28 +902,7 @@ static void master_service_listen(struct master_service_listener *l)
        net_set_nonblock(conn.fd, TRUE);
 
        master_service_client_connection_created(service);
-
-       service->callback(&conn);
-
-       if (!conn.accepted) {
-               if (close(conn.fd) < 0)
-                       i_error("close(service connection) failed: %m");
-               master_service_client_connection_destroyed(service);
-       } else if (conn.fifo) {
-               /* reading FIFOs stays open forever, don't count them
-                  as real clients */
-               master_service_client_connection_destroyed(service);
-       }
-       if (service->master_status.available_count == 0 &&
-           service->service_count_left == 1) {
-               /* we're not going to accept any more connections after this.
-                  go ahead and close the connection early. don't do this
-                  before calling callback, because it may want to access
-                  the listen_fd (e.g. to check socket permissions). */
-               i_assert(service->listeners != NULL);
-               master_service_io_listeners_remove(service);
-               master_service_io_listeners_close(service);
-       }
+       master_service_client_connection_callback(service, &conn);
 }
 
 static void io_listeners_init(struct master_service *service)