* Added support for protocols over Unix domain sockets.

[citadel.git] / citadel / sysdep.c

diff --git a/citadel/sysdep.c b/citadel/sysdep.c
index 5c613031302115215174eecb1c8d4a761a31afa0..59de2f8b5ab682cd8b091a26539ab1c3dfb76933 100644 (file)
--- a/citadel/sysdep.c
+++ b/citadel/sysdep.c
@@ -26,6 +26,7 @@
 #include <limits.h>
 #include <netinet/in.h>
 #include <netdb.h>
+#include <sys/un.h>
 #include <string.h>
 #include <pwd.h>
 #include <errno.h>
@@ -241,6 +242,7 @@ void init_sysdep(void) {
  */
 void begin_critical_section(int which_one)
 {
+       /* lprintf(9, "begin_critical_section(%d)\n", which_one); */
        pthread_mutex_lock(&Critters[which_one]);
 }
 
@@ -249,6 +251,7 @@ void begin_critical_section(int which_one)
  */
 void end_critical_section(int which_one)
 {
+       /* lprintf(9, "end_critical_section(%d)\n", which_one); */
        pthread_mutex_unlock(&Critters[which_one]);
 }
 
@@ -257,24 +260,40 @@ void end_critical_section(int which_one)
 /*
  * This is a generic function to set up a master socket for listening on
  * a TCP port.  The server shuts down if the bind fails.
+ *
+ * If a negative number is specified, a Unix domain socket is created.
  */
 int ig_tcp_server(int port_number, int queue_len)
 {
        struct sockaddr_in sin;
+       struct sockaddr_un addr;
        int s, i;
+       int is_unix = 0;
 
-       memset(&sin, 0, sizeof(sin));
-       sin.sin_family = AF_INET;
-       sin.sin_addr.s_addr = INADDR_ANY;
+       if (port_number < 0) {
+               is_unix = 1;
+       }
 
-       if (port_number == 0) {
-               lprintf(1, "citserver: illegal port number specified\n");
-               return(-1);
+       if (is_unix) {
+               memset(&addr, 0, sizeof(addr));
+               addr.sun_family = AF_UNIX;
+               sprintf(addr.sun_path, USOCKPATH, 0-port_number);
+       }
+       else {
+               memset(&sin, 0, sizeof(sin));
+               sin.sin_family = AF_INET;
+               sin.sin_addr.s_addr = INADDR_ANY;
+               sin.sin_port = htons((u_short)port_number);
+       }
+
+       if (is_unix) {
+               s = socket(AF_UNIX, SOCK_STREAM, 0);
+       }
+       else {
+               s = socket(PF_INET, SOCK_STREAM,
+                       (getprotobyname("tcp")->p_proto));
        }
-       
-       sin.sin_port = htons((u_short)port_number);
 
-       s = socket(PF_INET, SOCK_STREAM, (getprotobyname("tcp")->p_proto));
        if (s < 0) {
                lprintf(1, "citserver: Can't create a socket: %s\n",
                        strerror(errno));
@@ -282,12 +301,24 @@ int ig_tcp_server(int port_number, int queue_len)
        }
 
        /* Set the SO_REUSEADDR socket option, because it makes sense. */
-       i = 1;
-       setsockopt(s, SOL_SOCKET, SO_REUSEADDR, &i, sizeof(i));
+       if (!is_unix) {
+               i = 1;
+               setsockopt(s, SOL_SOCKET, SO_REUSEADDR, &i, sizeof(i));
+       }
 
-       if (bind(s, (struct sockaddr *)&sin, sizeof(sin)) < 0) {
-               lprintf(1, "citserver: Can't bind: %s\n", strerror(errno));
-               return(-1);
+       if (is_unix) {
+               if (bind(s, (struct sockaddr *)&addr, sizeof(addr)) < 0) {
+                       lprintf(1, "citserver: Can't bind: %s\n",
+                               strerror(errno));
+                       return(-1);
+               }
+       }
+       else {
+               if (bind(s, (struct sockaddr *)&sin, sizeof(sin)) < 0) {
+                       lprintf(1, "citserver: Can't bind: %s\n",
+                               strerror(errno));
+                       return(-1);
+               }
        }
 
        if (listen(s, queue_len) < 0) {
@@ -499,7 +530,25 @@ int client_gets(char *buf)
  * The system-dependent part of master_cleanup() - close the master socket.
  */
 void sysdep_master_cleanup(void) {
-       /* FIX close all protocol master sockets here */
+       struct ServiceFunctionHook *serviceptr;
+       char sockpath[256];
+
+       /*
+        * close all protocol master sockets
+        */
+       for (serviceptr = ServiceHookTable; serviceptr != NULL;
+           serviceptr = serviceptr->next ) {
+               lprintf(3, "Closing listener on port %d\n",
+                       serviceptr->tcp_port);
+               close(serviceptr->msock);
+
+               /* If it's a Unix domain socket, remove the file. */
+               if (serviceptr->tcp_port < 0) {
+                       sprintf(sockpath, USOCKPATH, 0-(serviceptr->tcp_port));
+                       lprintf(9, "Removing <%s>\n", sockpath);
+                       unlink(sockpath);
+               }
+       }
 }
 
 
@@ -817,7 +866,10 @@ int main(int argc, char **argv)
        /*
         * Bind the server to our favorite ports.
         */
-       CtdlRegisterServiceHook(config.c_port_number,
+       CtdlRegisterServiceHook(config.c_port_number,           /* TCP */
+                               citproto_begin_session,
+                               do_command_loop);
+       CtdlRegisterServiceHook(0-config.c_port_number,         /* Unix */
                                citproto_begin_session,
                                do_command_loop);
 
@@ -856,19 +908,9 @@ int main(int argc, char **argv)
 
        for (serviceptr = ServiceHookTable; serviceptr != NULL;
            serviceptr = serviceptr->next ) {
-               serviceptr->msock = ig_tcp_server(
-                       serviceptr->tcp_port, config.c_maxsessions);
-               if (serviceptr->msock >= 0) {
-                       FD_SET(serviceptr->msock, &masterfds);
-                       if (serviceptr->msock > masterhighest)
-                               masterhighest = serviceptr->msock;
-                       lprintf(7, "Bound to port %-5d (socket %d)\n",
-                               serviceptr->tcp_port,
-                               serviceptr->msock);
-               }
-               else {
-                       lprintf(1, "Unable to bind to port %d\n",
-                               serviceptr->tcp_port);
+               FD_SET(serviceptr->msock, &masterfds);
+               if (serviceptr->msock > masterhighest) {
+                       masterhighest = serviceptr->msock;
                }
        }
 
@@ -956,9 +998,6 @@ void worker_thread(void) {
 
        ++num_threads;
 
-       tv.tv_sec = 60;         /* wake up every minute if no input */
-       tv.tv_usec = 0;
-
        while (!time_to_die) {
 
                /* 
@@ -984,6 +1023,8 @@ SETUP_FD:  memcpy(&readfds, &masterfds, sizeof(fd_set) );
                }
                end_critical_section(S_SESSION_TABLE);
 
+               tv.tv_sec = 60;         /* wake up every minute if no input */
+               tv.tv_usec = 0;
                retval = select(highest + 1, &readfds, NULL, NULL, &tv);
 
                /* Now figure out who made this select() unblock.
@@ -1084,9 +1125,6 @@ SETUP_FD: memcpy(&readfds, &masterfds, sizeof(fd_set) );
                                } 
                                write(rescan[1], &junk, 1);
                        }
-                       else {
-                               lprintf(9, "Thread found nothing to do!\n");
-                       }
 
                }
                dead_session_purge();