X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fcmd_restart.cpp;h=106531e792b98d98b9574c5632b615fdc12c84d5;hb=187ece1bab24da3e9fda31053aaa04c5e4c401f9;hp=c16570a74628bfa61e57bc42ce1b751ac8b48745;hpb=1e639377cbad496a0b5f7d969a88fb808508f811;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/cmd_restart.cpp b/src/cmd_restart.cpp
index c16570a74..106531e79 100644
--- a/src/cmd_restart.cpp
+++ b/src/cmd_restart.cpp
@@ -2,103 +2,49 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd is copyright (C) 2002-2006 ChatSpike-Dev.
- *                       E-mail:
- *                <brain@chatspike.net>
- *                <Craig@chatspike.net>
+ *  InspIRCd: (C) 2002-2007 InspIRCd Development Team
+ * See: http://www.inspircd.org/wiki/index.php/Credits
  *
- * Written by Craig Edwards, Craig McLure, and others.
  * This program is free but copyrighted software; see
  *            the file COPYING for details.
  *
  * ---------------------------------------------------
  */
 
-using namespace std;
-
-#include "inspircd_config.h"
-#include "inspircd.h"
-#include "inspircd_io.h"
-#include <time.h>
-#include <string>
-#ifdef GCC3
-#include <ext/hash_map>
-#else
-#include <hash_map>
-#endif
-#include <map>
-#include <sstream>
-#include <vector>
-#include <deque>
+#include "configreader.h"
 #include "users.h"
-#include "ctables.h"
-#include "globals.h"
-#include "modules.h"
-#include "dynamic.h"
-#include "wildcard.h"
-#include "message.h"
-#include "commands.h"
-#include "mode.h"
-#include "xline.h"
-#include "inspstring.h"
-#include "dnsqueue.h"
-#include "helperfuncs.h"
-#include "hashcomp.h"
-#include "socketengine.h"
-#include "typedefs.h"
-#include "command_parse.h"
-#include "cmd_restart.h"
+#include "commands/cmd_restart.h"
+
+
 
-extern ServerConfig* Config;
-extern InspIRCd* ServerInstance;
-extern int MODCOUNT;
-extern std::vector<Module*> modules;
-extern std::vector<ircd_module*> factory;
-extern time_t TIME;
-extern user_hash clientlist;
-extern chan_hash chanlist;
-extern std::vector<userrec*> all_opers;
-extern std::vector<userrec*> local_users;
-extern userrec* fd_ref_table[MAX_DESCRIPTORS];
+extern "C" command_t* init_command(InspIRCd* Instance)
+{
+	return new cmd_restart(Instance);
+}
 
-void cmd_restart::Handle (char **parameters, int pcnt, userrec *user)
+CmdResult cmd_restart::Handle (const char** parameters, int pcnt, userrec *user)
 {
-	char *argv[32];
-	log(DEFAULT,"Restart: %s",user->nick);
-	if (!strcmp(parameters[0],Config->restartpass))
+	ServerInstance->Log(DEFAULT,"Restart: %s",user->nick);
+	if (!strcmp(parameters[0],ServerInstance->Config->restartpass))
 	{
-		WriteOpers("*** RESTART command from %s!%s@%s, restarting server.",user->nick,user->ident,user->host);
+		ServerInstance->WriteOpers("*** RESTART command from %s!%s@%s, restarting server.",user->nick,user->ident,user->host);
 
-		argv[0] = Config->MyExecutable;
-		argv[1] = "-wait";
-		if (Config->nofork)
+		try
 		{
-			argv[2] = "-nofork";
+			ServerInstance->Restart("Server restarting.");
 		}
-		else
+		catch (CoreException &e)
 		{
-			argv[2] = NULL;
+			/* We dont actually get here unless theres some fatal and unrecoverable error. */
+			exit(0);
 		}
-		argv[3] = NULL;
-		
-		// close ALL file descriptors
-		send_error("Server restarting.");
-		sleep(1);
-		for (int i = 0; i < MAX_DESCRIPTORS; i++)
-		{
-			shutdown(i,2);
-    			close(i);
-		}
-		sleep(2);
-		
-		execv(Config->MyExecutable,argv);
-
-		exit(0);
 	}
 	else
 	{
-		WriteOpers("*** Failed RESTART Command from %s!%s@%s.",user->nick,user->ident,user->host);
+		ServerInstance->WriteOpers("*** Failed RESTART Command from %s!%s@%s.",user->nick,user->ident,user->host);
+		return CMD_FAILURE;
 	}
-}
 
+	return CMD_SUCCESS;
+}