* Removed HOOK_DIE

svn: 897

doc/UPDATES

@@ -8,7 +8,7 @@ This is a summary of ChangeLog basically.
 4.Segfault fix in cmd_debug.
 5.Fixed a potential bug in share.
 
-1.1.4
+1.1.4 (Quickly advanced to 1.1.5)
 
 1.User flag +x is now correctly recognized in more places.
 2.Auth system was broken similar to the channel ctcp bug.

src/hooks.h

@@ -8,9 +8,8 @@
 #define HOOK_PRE_REHASH           3
 #define HOOK_IDLE                 4
 #define HOOK_BACKUP               5
-#define HOOK_DIE                  6
-#define HOOK_DAILY                7
-#define REAL_HOOKS                8
+#define HOOK_DAILY                8
+#define REAL_HOOKS                9
 
 #define HOOK_RFC_CASECMP        111
 

src/misc.c

@@ -677,7 +677,9 @@ void kill_bot(char *s1, char *s2)
 #ifdef HUB
   write_userfile(-1);
 #endif /* HUB */
-  call_hook(HOOK_DIE);
+#ifdef LEAF
+  server_die();
+#endif /* LEAF */
   chatout("*** %s\n", s1);
   botnet_send_chat(-1, conf.bot->nick, s1);
   botnet_send_bye();

src/mod/server.mod/server.c

@@ -1407,12 +1407,12 @@ void server_postrehash()
     strcpy(botname, oldnick);
 }
 
-static void server_die()
+void server_die()
 {
   cycle_time = 100;
   if (server_online) {
     dprintf(-serv, "QUIT :%s\n", quit_msg[0] ? quit_msg : "");
-    sleep(3); /* Give the server time to understand */
+    sleep(2); /* Give the server time to understand */
   }
   nuke_server(NULL);
 }
@@ -1553,7 +1553,6 @@ void server_init()
   timer_create_secs(300, "server_5minutely", (Function) server_5minutely);
   timer_create_secs(60, "minutely_checks", (Function) minutely_checks);
   add_hook(HOOK_PRE_REHASH, (Function) server_prerehash);
-  add_hook(HOOK_DIE, (Function) server_die);
   mq.head = hq.head = modeq.head = NULL;
   mq.last = hq.last = modeq.last = NULL;
   mq.tot = hq.tot = modeq.tot = 0;

src/mod/server.mod/server.h

@@ -65,6 +65,7 @@ int detect_avalanche(char *);
 void server_report(int, int);
 void server_init();
 void queue_server(int, char *, int);
+void server_die();
 void server_postrehash();
 
 #endif /*leaf*/