add is_normalized_ipmask

[irc/quakenet/newserv.git] / core / main.c

diff --git a/core/main.c b/core/main.c
index 06f78bca5948b256e51909630ce47be368b24c9c..ec6f4abce165d1d9a73949888257c9a97bfe43a4 100644 (file)
--- a/core/main.c
+++ b/core/main.c
@@ -13,15 +13,18 @@
 #include <sys/time.h>
 #include <signal.h>
 
-int newserv_shutdown_pending;
-int newserv_sigusr1_pending;
-
 void initseed();
 void init_logfile();
 void siginthandler(int sig);
 void sigusr1handler(int sig);
 void sigsegvhandler(int sig);
+void sighuphandler(int sig);
 void handlecore(void);
+void handlesignals(void);
+
+int newserv_shutdown_pending;
+static int newserv_sigint_pending, newserv_sigusr1_pending, newserv_sighup_pending;
+static void (*oldsegv)(int);
 
 int main(int argc, char **argv) {
   initseed();
@@ -43,28 +46,49 @@ int main(int argc, char **argv) {
   initmodules();
   signal(SIGINT, siginthandler);
   signal(SIGUSR1, sigusr1handler);
-  signal(SIGSEGV, sigsegvhandler);
+  signal(SIGHUP, sighuphandler);
+  oldsegv = signal(SIGSEGV, sigsegvhandler);
 
   /* Main loop */
   for(;;) {
     handleevents(10);  
     doscheduledevents(time(NULL));
+
     if (newserv_shutdown_pending) {
       newserv_shutdown();
       break;
     }
 
-    if (newserv_sigusr1_pending) {
-      signal(SIGUSR1, sigusr1handler);
-      triggerhook(HOOK_CORE_SIGUSR1, NULL);
-      newserv_sigusr1_pending=0;
-    }
+    handlesignals();
   }  
 
-  nsexit();
-
   freeconfig();
   finisstring();  
+
+  nsexit();
+}
+
+void handlesignals(void) {
+  if (newserv_sigusr1_pending) {
+    signal(SIGUSR1, sigusr1handler);
+    Error("core", ERR_INFO, "SIGUSR1 received.");
+    triggerhook(HOOK_CORE_SIGUSR1, NULL);
+    newserv_sigusr1_pending=0;
+   }
+
+  if (newserv_sighup_pending) {
+    signal(SIGHUP, sighuphandler);
+    Error("core", ERR_INFO, "SIGHUP received, rehashing...");
+    triggerhook(HOOK_CORE_REHASH, (void *)1);
+    newserv_sighup_pending=0;
+  }
+
+  if (newserv_sigint_pending) {
+    Error("core", ERR_INFO, "SIGINT received, terminating.");
+    triggerhook(HOOK_CORE_SIGINT, NULL);
+    newserv_sigint_pending=0;
+    newserv_shutdown_pending=1;
+  }
 }
 
 /*
@@ -78,14 +102,19 @@ void initseed() {
 }
 
 void siginthandler(int sig) {
-  newserv_shutdown_pending = 1;
+  newserv_sigint_pending = 1;
 }
 
 void sigusr1handler(int sig) {
   newserv_sigusr1_pending = 1;
 }
 
+void sighuphandler(int sig) {
+  newserv_sighup_pending = 1;
+}
+
 void sigsegvhandler(int sig) {
   handlecore();
-}
 
+  oldsegv(sig);
+}