X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fcmd_die.cpp;h=fc2cc473efa0de48cd20f36c77ee558ddd352735;hb=1b7c615062a7b203c7fc3ce4c56e16eb671f7c15;hp=3966021b51e8d89e5a79edae39c21a668d1acc74;hpb=1383dba43e463f292aea094d01f62f355946049d;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/cmd_die.cpp b/src/cmd_die.cpp
index 3966021b5..fc2cc473e 100644
--- a/src/cmd_die.cpp
+++ b/src/cmd_die.cpp
@@ -14,40 +14,44 @@
  * ---------------------------------------------------
  */
 
-using namespace std;
-
-#include "inspircd_config.h"
-#include "inspircd.h"
-#include "inspircd_io.h"
-#include <time.h>
-#include <string>
+#include "configreader.h"
 #include "users.h"
-#include "ctables.h"
-#include "globals.h"
-#include "wildcard.h"
-#include "message.h"
-#include "commands.h"
-#include "inspstring.h"
-#include "helperfuncs.h"
-#include "hashcomp.h"
-#include "typedefs.h"
-#include "cmd_die.h"
+#include "commands/cmd_die.h"
+
 
-extern ServerConfig* Config;
 
-void cmd_die::Handle (char **parameters, int pcnt, userrec *user)
+extern "C" command_t* init_command(InspIRCd* Instance)
 {
-	log(DEBUG,"die: %s",user->nick);
-	if (!strcmp(parameters[0],Config->diepass))
+	return new cmd_die(Instance);
+}
+
+void cmd_die::Handle (const char** parameters, int pcnt, userrec *user)
+{
+	if (!strcmp(parameters[0],ServerInstance->Config->diepass))
 	{
-		WriteOpers("*** DIE command from %s!%s@%s, terminating...",user->nick,user->ident,user->host);
-		sleep(Config->DieDelay);
-		Exit(ERROR);
+		ServerInstance->Log(SPARSE, "/DIE command from %s!%s@%s, terminating in %d seconds...", user->nick, user->ident, user->host, ServerInstance->Config->DieDelay);
+		
+		/* This would just be WriteOpers(), but as we just sleep() and then die then the write buffers never get flushed.
+		 * so we iterate the oper list, writing the message and immediately trying to flush their write buffer.
+		 */
+		
+		for (std::vector<userrec*>::iterator i = ServerInstance->all_opers.begin(); i != ServerInstance->all_opers.end(); i++)
+		{
+			userrec* a = *i;
+			
+			if (IS_LOCAL(a) && (a->modes[UM_SERVERNOTICE]))
+			{
+				a->WriteServ("NOTICE %s :*** DIE command from %s!%s@%s, terminating...", a->nick, a->nick, a->ident, a->host);
+				a->FlushWriteBuf();
+			}
+		}
+		
+		sleep(ServerInstance->Config->DieDelay);
+		InspIRCd::Exit(ERROR);
 	}
 	else
 	{
-		WriteOpers("*** Failed DIE Command from %s!%s@%s.",user->nick,user->ident,user->host);
+		ServerInstance->Log(SPARSE, "Failed /DIE command from %s!%s@%s", user->nick, user->ident, user->host);
+		ServerInstance->WriteOpers("*** Failed DIE Command from %s!%s@%s.",user->nick,user->ident,user->host);
 	}
 }
-
-