Author: Carlo Wood <run@alinoe.com> (Via Isomer <isomer@undernet.org>)

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

diff --git a/ircd/ircd.c b/ircd/ircd.c
index d6085344441600988cc0412cbb60c8adbbecd8c5..1300dec900675d5e4df8adef3314c1534c6f4449 100644 (file)
--- a/ircd/ircd.c
+++ b/ircd/ircd.c
@@ -26,6 +26,7 @@
 #include "class.h"
 #include "client.h"
 #include "crule.h"
+#include "destruct_event.h"
 #include "hash.h"
 #include "ircd_alloc.h"
 #include "ircd_events.h"
@@ -103,6 +104,7 @@ static char   *dpath             = DPATH;
 
 static struct Timer connect_timer; /* timer structure for try_connections() */
 static struct Timer ping_timer; /* timer structure for check_pings() */
+static struct Timer destruct_event_timer; /* timer structure for exec_expired_destruct_events() */
 
 static struct Daemon thisServer  = { 0, 0, 0, 0, 0, 0, 0, -1, 0, 0, 0 };
 
@@ -378,7 +380,7 @@ static void check_pings(struct Event* ev) {
                   ":Your client may not be compatible with this server.");
        send_reply(cptr, SND_EXPLICIT | ERR_BADPING,
                   ":Compatible clients are available at "
-                  "ftp://ftp.undernet.org/pub/irc/clients");
+                  URL_CLIENTS);
       }    
       exit_client_msg(cptr,cptr,&me, "Ping Timeout");
       continue;
@@ -492,9 +494,9 @@ static char check_file_access(const char *path, char which, int mode) {
 
   fprintf(stderr, 
          "Check on %cPATH (%s) failed: %s\n"
-         "Please create file and/or rerun `make config' and "
-         "recompile to correct this.\n",
-         which, path, strerror(errno));
+         "Please create this file and/or rerun `configure' "
+         "using --with-%cpath and recompile to correct this.\n",
+         which, path, strerror(errno), which);
 
   return 0;
 }
@@ -573,11 +575,6 @@ int main(int argc, char **argv) {
   if (!check_file_access(SPATH, 'S', X_OK) ||
       !check_file_access(configfile, 'C', R_OK))
     return 4;
-      
-#ifdef DEBUGMODE
-  if (!check_file_access(LPATH, 'L', W_OK))
-    return 5;
-#endif
 
   debug_init(thisServer.bootopt & BOOT_TTY);
   daemon_init(thisServer.bootopt & BOOT_TTY);
@@ -620,8 +617,9 @@ int main(int argc, char **argv) {
   uping_init();
 
   IPcheck_init();
-  timer_add(&connect_timer, try_connections, 0, TT_RELATIVE, 1);
-  timer_add(&ping_timer, check_pings, 0, TT_RELATIVE, 1);
+  timer_add(timer_init(&connect_timer), try_connections, 0, TT_RELATIVE, 1);
+  timer_add(timer_init(&ping_timer), check_pings, 0, TT_RELATIVE, 1);
+  timer_add(timer_init(&destruct_event_timer), exec_expired_destruct_events, 0, TT_PERIODIC, 60);
 
   CurrentTime = time(NULL);