frontend: Added sdb_fe_sock_clear_listeners().

This function may be used to shut down and clear all listeners associated with
a socket object without affecting any open connections.

diff --git a/src/frontend/sock.c b/src/frontend/sock.c
index 7cfdb7cac4b84d21c2f476e38b08855ea80c970b..90aeab1406a6a6389f8ce083dbab72a624b4a936 100644 (file)
--- a/src/frontend/sock.c
+++ b/src/frontend/sock.c
@@ -274,6 +274,20 @@ listener_create(sdb_fe_socket_t *sock, const char *address)
        return listener;
 } /* listener_create */
 
+static void
+socket_clear(sdb_fe_socket_t *sock)
+{
+       size_t i;
+
+       assert(sock);
+       for (i = 0; i < sock->listeners_num; ++i)
+               listener_destroy(sock->listeners + i);
+       if (sock->listeners)
+               free(sock->listeners);
+       sock->listeners = NULL;
+       sock->listeners_num = 0;
+} /* socket_clear */
+
 static void
 socket_close(sdb_fe_socket_t *sock)
 {
@@ -423,17 +437,10 @@ sdb_fe_sock_create(void)
 void
 sdb_fe_sock_destroy(sdb_fe_socket_t *sock)
 {
-       size_t i;
-
        if (! sock)
                return;
 
-       for (i = 0; i < sock->listeners_num; ++i) {
-               listener_destroy(sock->listeners + i);
-       }
-       if (sock->listeners)
-               free(sock->listeners);
-       sock->listeners = NULL;
+       socket_clear(sock);
 
        sdb_llist_destroy(sock->open_connections);
        sock->open_connections = NULL;
@@ -454,6 +461,15 @@ sdb_fe_sock_add_listener(sdb_fe_socket_t *sock, const char *address)
        return 0;
 } /* sdb_fe_sock_add_listener */
 
+void
+sdb_fe_sock_clear_listeners(sdb_fe_socket_t *sock)
+{
+       if (! sock)
+               return;
+
+       socket_clear(sock);
+} /* sdb_fe_sock_clear_listeners */
+
 int
 sdb_fe_sock_listen_and_serve(sdb_fe_socket_t *sock, sdb_fe_loop_t *loop)
 {

diff --git a/src/include/frontend/sock.h b/src/include/frontend/sock.h
index 7d1fd7a3ceed81995e790921a2258949d8d25f7a..2b93a6f724d1adaca687d81e149fa49fecb5bf68 100644 (file)
--- a/src/include/frontend/sock.h
+++ b/src/include/frontend/sock.h
@@ -83,6 +83,14 @@ sdb_fe_sock_destroy(sdb_fe_socket_t *sock);
 int
 sdb_fe_sock_add_listener(sdb_fe_socket_t *sock, const char *address);
 
+/*
+ * sdb_fe_sock_clear_listeners:
+ * Shut down all listeners from the socket object and clear the list of
+ * listeners. All open connections will not be affected by this.
+ */
+void
+sdb_fe_sock_clear_listeners(sdb_fe_socket_t *sock);
+
 /*
  * sdb_fe_sock_listen_and_serve:
  * Listen on the specified socket and serve client requests. The loop