Merged branch 'master' of git://git.tokkee.org/sysdb.

[sysdb.git] / src / frontend / sock.c

diff --git a/src/frontend/sock.c b/src/frontend/sock.c
index 7cfdb7cac4b84d21c2f476e38b08855ea80c970b..2e5a6aff66d6484831907c1bcc31fb0b7dd698cb 100644 (file)
--- a/src/frontend/sock.c
+++ b/src/frontend/sock.c
@@ -93,6 +93,7 @@ struct sdb_fe_socket {
 static int
 open_unix_sock(listener_t *listener)
 {
+       const char *addr;
        struct sockaddr_un sa;
        int status;
 
@@ -104,12 +105,16 @@ open_unix_sock(listener_t *listener)
                return -1;
        }
 
+       if (*listener->address == '/')
+               addr = listener->address;
+       else
+               addr = listener->address + strlen("unix:");
+
        memset(&sa, 0, sizeof(sa));
        sa.sun_family = AF_UNIX;
-       strncpy(sa.sun_path, listener->address + strlen("unix:"),
-                       sizeof(sa.sun_path));
+       strncpy(sa.sun_path, addr, sizeof(sa.sun_path));
 
-       if (unlink(listener->address + strlen("unix:")) && (errno != ENOENT)) {
+       if (unlink(addr) && (errno != ENOENT)) {
                char errbuf[1024];
                sdb_log(SDB_LOG_WARNING, "frontend: Failed to remove stale UNIX "
                                "socket %s: %s", listener->address + strlen("unix:"),
@@ -129,15 +134,22 @@ open_unix_sock(listener_t *listener)
 static void
 close_unix_sock(listener_t *listener)
 {
+       const char *addr;
        assert(listener);
+
        if (! listener->address)
                return;
 
+       if (*listener->address == '/')
+               addr = listener->address;
+       else
+               addr = listener->address + strlen("unix:");
+
        if (listener->sock_fd >= 0)
                close(listener->sock_fd);
        listener->sock_fd = -1;
 
-       unlink(listener->address + strlen("unix:"));
+       unlink(addr);
 } /* close_unix_sock */
 
 /*
@@ -147,7 +159,7 @@ close_unix_sock(listener_t *listener)
 /* the enum has to be sorted the same as the implementations array
  * to ensure that the type may be used as index into the array */
 enum {
-       LISTENER_UNIXSOCK = 0,
+       LISTENER_UNIXSOCK = 0, /* this is the default */
 };
 static fe_listener_impl_t listener_impls[] = {
        { LISTENER_UNIXSOCK, "unix", open_unix_sock, close_unix_sock },
@@ -199,7 +211,7 @@ get_type(const char *address)
 
        sep = strchr(address, (int)':');
        if (! sep)
-               return -1;
+               return listener_impls[0].type;
 
        assert(sep > address);
        len = (size_t)(sep - address);
@@ -274,6 +286,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 +449,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 +473,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)
 {