Changes from dtanner.

[moira.git] / server / mr_main.c

diff --git a/server/mr_main.c b/server/mr_main.c
index 13c85701203b778d67a0e753ce245564b50986a6..8b916152079a00dfe13c79666a8c60f0c6fe1a16 100644 (file)
--- a/server/mr_main.c
+++ b/server/mr_main.c
@@ -32,8 +32,6 @@
 
 RCSID("$Header$");
 
-extern char *krb_get_lrealm(char *, int);
-
 client *cur_client;
 
 char *whoami;
@@ -162,7 +160,8 @@ int main(int argc, char **argv)
   /*
    * Establish template connection.
    */
-  if (!(listener = mr_listen(port)))
+  listener = mr_listen(port);
+  if (listener == -1)
     {
       com_err(whoami, status, "trying to create listening connection");
       exit(1);
@@ -185,11 +184,12 @@ int main(int argc, char **argv)
   while (!takedown)
     {
       int i;
-      struct timeval timeout;
+      struct timeval timeout = {60, 0}; /* 1 minute */
 
       /* If we're supposed to go down and we can, do it */
-      if ((dormant == AWAKE) && (nclients == 0) &&
-         (stat(MOIRA_MOTD_FILE, &stbuf) == 0))
+      if (((dormant == AWAKE) && (nclients == 0) &&
+          (stat(MOIRA_MOTD_FILE, &stbuf) == 0)) ||
+         (dormant == SLEEPY))
        {
          mr_close_database();
          com_err(whoami, 0, "database closed");
@@ -201,8 +201,7 @@ int main(int argc, char **argv)
       /* Block until something happens. */
       memcpy(&readfds, &xreadfds, sizeof(readfds));
       memcpy(&writefds, &xwritefds, sizeof(writefds));
-      /* XXX set timeout */
-      if (select(nfds, &readfds, &writefds, NULL, NULL) == -1)
+      if (select(nfds, &readfds, &writefds, NULL, &timeout) == -1)
        {
          if (errno != EINTR)
            com_err(whoami, errno, "in select");
@@ -232,11 +231,11 @@ int main(int argc, char **argv)
       /* Handle any new connections */
       if (FD_ISSET(listener, &readfds))
        {
-         int newconn;
+         int newconn, addrlen = sizeof(struct sockaddr_in);
          struct sockaddr_in addr;
          client *cp;
 
-         newconn = mr_accept(listener, &addr);
+         newconn = accept(listener, (struct sockaddr *)&addr, &addrlen);
          if (newconn == -1)
            com_err(whoami, errno, "accepting new connection");
          else if (newconn > 0)
@@ -262,6 +261,8 @@ int main(int argc, char **argv)
              cp->tuplessize = 1;
              cp->tuples = xmalloc(sizeof(mr_params));
              memset(cp->tuples, 0, sizeof(mr_params));
+             cp->state = CL_ACCEPTING;
+             cp->version = 2;
 
              cur_client = cp;
              com_err(whoami, 0,
@@ -283,7 +284,6 @@ int main(int argc, char **argv)
              if (!clients[i]->ntuples)
                {
                  FD_CLR(clients[i]->con, &xwritefds);
-                 /* Now that we're done writing we can read again */
                  FD_SET(clients[i]->con, &xreadfds);
                }
              clients[i]->last_time_used = now;
@@ -291,19 +291,44 @@ int main(int argc, char **argv)
 
          if (FD_ISSET(clients[i]->con, &readfds))
            {
-             client_read(clients[i]);
-             if (clients[i]->ntuples)
-               FD_SET(clients[i]->con, &xwritefds);
-             clients[i]->last_time_used = now;
+             if (clients[i]->state == CL_ACCEPTING)
+               {
+                 switch(mr_cont_accept(clients[i]->con,
+                                       &clients[i]->hsbuf,
+                                       &clients[i]->hslen))
+                   {
+                   case -1:
+                     break;
+
+                   case 0:
+                     clients[i]->state = CL_CLOSING;
+                     break;
+
+                   default:
+                     clients[i]->state = CL_ACTIVE;
+                     clients[i]->hsbuf = NULL;
+                     break;
+                   }
+               }
+             else
+               {
+                 client_read(clients[i]);
+                 if (clients[i]->ntuples)
+                   {
+                     FD_CLR(clients[i]->con, &xreadfds);
+                     FD_SET(clients[i]->con, &xwritefds);
+                   }
+                 clients[i]->last_time_used = now;
+               }
            }
 
          if (clients[i]->last_time_used < tardy)
            {
              com_err(whoami, 0, "Shutting down connection due to inactivity");
-             clients[i]->done = 1;
+             clients[i]->state = CL_CLOSING;
            }
 
-         if (clients[i]->done)
+         if (clients[i]->state == CL_CLOSING)
            {
              client *old;
 
@@ -315,9 +340,9 @@ int main(int argc, char **argv)
              close(clients[i]->con);
              FD_CLR(clients[i]->con, &xreadfds);
              FD_CLR(clients[i]->con, &xwritefds);
-             for (; clients[i]->ntuples; clients[i]->ntuples--)
-               mr_destroy_reply(clients[i]->tuples[clients[i]->ntuples - 1]);
+             free_rtn_tuples(clients[i]);
              free(clients[i]->tuples);
+             free(clients[i]->hsbuf);
              old = clients[i];
              clients[i] = clients[--nclients];
              free(old);
@@ -345,8 +370,10 @@ void reapchild(int x)
       if (pid == inc_pid)
        inc_running = 0;
       if (!takedown && (WTERMSIG(status) != 0 || WEXITSTATUS(status) != 0))
-       com_err(whoami, 0, "%d: child exits with signal %d status %d",
-               pid, WTERMSIG(status), WEXITSTATUS(status));
+       {
+         critical_alert("moirad", "%d: child exits with signal %d status %d",
+                        pid, WTERMSIG(status), WEXITSTATUS(status));
+       }
     }
 }
 
@@ -419,6 +446,13 @@ void mr_setup_signals(void)
       exit(1);
     }
 
+  action.sa_handler = SIG_IGN;
+  if (sigaction(SIGPIPE, &action, NULL) < 0)
+    {
+      com_err(whoami, errno, "Unable to establish signal handlers.");
+      exit(1);
+    }
+
   action.sa_handler = reapchild;
   sigaddset(&action.sa_mask, SIGCHLD);
   if (sigaction(SIGCHLD, &action, NULL) < 0)