Add infrastructure to handle child processes exiting.

[ircu2.10.12-pk.git] / ircd / ircd.c

diff --git a/ircd/ircd.c b/ircd/ircd.c
index b1c191a57639b5d7ad28bf974f007ad6916981b3..2c0046fecb9ac39193d6e568a60f2a22ab4670c3 100644 (file)
--- a/ircd/ircd.c
+++ b/ircd/ircd.c
@@ -180,6 +180,8 @@ void server_restart(const char *message)
 
   close_connections(!(thisServer.bootopt & (BOOT_TTY | BOOT_DEBUG | BOOT_CHKCONF)));
 
+  reap_children();
+
   execv(SPATH, thisServer.argv);
 
   /* Have to reopen since it has been closed above */
@@ -250,39 +252,42 @@ static int check_pid(void)
 static void try_connections(struct Event* ev) {
   struct ConfItem*  aconf;
   struct ConfItem** pconf;
-  time_t            next        = 0;
-  struct ConnectionClass* cltmp;
+  time_t            next;
   struct Jupe*      ajupe;
-  int hold;
+  int               hold;
+  int               done;
 
   assert(ET_EXPIRE == ev_type(ev));
   assert(0 != ev_timer(ev));
 
   Debug((DEBUG_NOTICE, "Connection check at   : %s", myctime(CurrentTime)));
+  next = CurrentTime + feature_int(FEAT_CONNECTFREQUENCY);
+  done = 0;
+
   for (aconf = GlobalConfList; aconf; aconf = aconf->next) {
     /* Only consider server items with non-zero port and non-zero
      * connect times that are not actively juped.
      */
     if (!(aconf->status & CONF_SERVER)
         || aconf->address.port == 0
+        || !(aconf->flags & CONF_AUTOCONNECT)
         || ((ajupe = jupe_find(aconf->name)) && JupeIsActive(ajupe)))
       continue;
 
+    /* Do we need to postpone this connection further? */
+    hold = aconf->hold > CurrentTime;
+
     /* Update next possible connection check time. */
-    if (next > aconf->hold || next == 0)
+    if (hold && next > aconf->hold)
         next = aconf->hold;
 
-    /* Update the next time we can consider this entry. */
-    cltmp = aconf->conn_class;
-    hold = aconf->hold > CurrentTime; /* before we update aconf->hold */
-    aconf->hold = ConFreq(cltmp) ? CurrentTime + ConFreq(cltmp) : 0;
-
     /* Do not try to connect if its use is still on hold until future,
+     * we have already initiated a connection this try_connections(),
      * too many links in its connection class, it is already linked,
      * or if connect rules forbid a link now.
      */
-    if (hold
-        || (Links(cltmp) > MaxLinks(cltmp))
+    if (hold || done
+        || (ConfLinks(aconf) > ConfMaxLinks(aconf))
         || FindServer(aconf->name)
         || conf_eval_crule(aconf->name, CRULE_MASK))
       continue;
@@ -304,14 +309,10 @@ static void try_connections(struct Event* ev) {
                           aconf->name);
 
     /* And stop looking for further candidates. */
-    break;
+    done = 1;
   }
 
-  if (next == 0)
-    next = CurrentTime + feature_int(FEAT_CONNECTFREQUENCY);
-
   Debug((DEBUG_NOTICE, "Next connection check : %s", myctime(next)));
-
   timer_add(&connect_timer, try_connections, 0, TT_ABSOLUTE, next);
 }
 
@@ -483,6 +484,9 @@ static void parse_command_line(int argc, char** argv) {
 #ifdef USE_DEVPOLL
       printf("/dev/poll ");
 #endif
+#ifdef USE_EPOLL
+      printf("epoll_*() ");
+#endif
 #ifdef USE_POLL
       printf("poll()");
 #else
@@ -501,11 +505,18 @@ static void parse_command_line(int argc, char** argv) {
       debugmode = optarg;
       thisServer.bootopt |= BOOT_DEBUG;
       break;
-      
+
     default:
-      printf("Usage: ircd [-f config] [-h servername] [-x loglevel] [-ntvk]\n");
-      printf("\n -n -t\t Don't detach\n -v\t display version\n -k\t exit after checking config\n\n");
-      printf("Server not started.\n");
+      printf("Usage: ircd [-f config] [-h servername] [-x loglevel] [-ntv] [-k [-c clispec]]\n"
+             "\n -f config\t specify explicit configuration file"
+             "\n -x loglevel\t set debug logging verbosity"
+             "\n -n or -t\t don't detach"
+             "\n -v\t\t display version"
+             "\n -k\t\t exit after checking config"
+             "\n -c clispec\t search for client/kill blocks matching client"
+             "\n\t\t clispec is comma-separated list of user@host,"
+             "\n\t\t user@ip, $Rrealname, and port number"
+             "\n\nServer not started.\n");
       exit(1);
     }
 }
@@ -648,6 +659,23 @@ int main(int argc, char **argv) {
    */
   daemon_init(thisServer.bootopt & BOOT_TTY);
 
+#ifdef DEBUGMODE
+  /* Must reserve fd 2... */
+  if (debuglevel >= 0 && !(thisServer.bootopt & BOOT_TTY)) {
+    int fd;
+    if ((fd = open("/dev/null", O_WRONLY)) < 0) {
+      fprintf(stderr, "Unable to open /dev/null (to reserve fd 2): %s\n",
+             strerror(errno));
+      return 8;
+    }
+    if (fd != 2 && dup2(fd, 2) < 0) {
+      fprintf(stderr, "Unable to reserve fd 2; dup2 said: %s\n",
+             strerror(errno));
+      return 8;
+    }
+  }
+#endif
+
   event_init(MAXCONNECTIONS);
 
   setup_signals();
@@ -655,11 +683,6 @@ int main(int argc, char **argv) {
   log_init(*argv);
   set_nomem_handler(outofmemory);
 
-  if (!init_string()) {
-    log_write(LS_SYSTEM, L_CRIT, 0, "Failed to initialize string module");
-    return 6;
-  }
-
   initload();
   init_list();
   init_hash();