From bf1636c63eabbe05dcd9699482fc1f858a45e578 Mon Sep 17 00:00:00 2001 From: Aki Date: Wed, 6 Apr 2022 22:52:40 +0200 Subject: Removed server shutdown/reset command --- StarsEx/NetAdminServer.cpp | 100 --------------------------------------------- StarsEx/StarServer.cpp | 54 ------------------------ StarsEx/StarServer.h | 2 - 3 files changed, 156 deletions(-) (limited to 'StarsEx') diff --git a/StarsEx/NetAdminServer.cpp b/StarsEx/NetAdminServer.cpp index b5efad7..7e82801 100644 --- a/StarsEx/NetAdminServer.cpp +++ b/StarsEx/NetAdminServer.cpp @@ -20,7 +20,6 @@ #include "NetUser.h" #include "NetChat.h" -#include "StarServer.h" #include "HttpServlet.h" #include "NetLayer.h" @@ -148,81 +147,6 @@ public: // +-------------------------------------------------------------------+ // +-------------------------------------------------------------------+ -class NetAdminServerMgr : public NetAdminServlet -{ -public: - NetAdminServerMgr() { } - virtual ~NetAdminServerMgr() { } - - virtual bool DoGet(HttpRequest& request, HttpResponse& response) { - if (CheckUser(request, response)) { - Text action = request.GetParam("action"); - action.setSensitive(false); - - bool completed = false; - - if (action == "restart") { - StarServer* svr = StarServer::GetInstance(); - - if (svr) { - svr->Shutdown(true); - completed = true; - - response.SetStatus(HttpResponse::SC_OK); - response.SetHeader("MIME-Version", "1.0"); - response.SetHeader("Content-Type", "text/html"); - response.SetHeader("Cache-Control", "no-cache"); - response.SetHeader("Expires", "-1"); - - response.SetContent(GetHead("Restart") + - GetTitleBar() + - "

The Starshatter Server will restart in three (3) seconds.

" + - GetBodyClose()); - } - } - - else if (action == "shutdown") { - StarServer* svr = StarServer::GetInstance(); - - if (svr) { - svr->Shutdown(false); - completed = true; - - response.SetStatus(HttpResponse::SC_OK); - response.SetHeader("MIME-Version", "1.0"); - response.SetHeader("Content-Type", "text/html"); - response.SetHeader("Cache-Control", "no-cache"); - response.SetHeader("Expires", "-1"); - - response.SetContent(GetHead("Restart") + - GetTitleBar() + - "

The Starshatter Server will shutdown in three (3) seconds.

" + - GetBodyClose()); - } - } - - if (!completed) { - response.SetStatus(HttpResponse::SC_TEMPORARY_REDIRECT); - response.SetHeader("MIME-Version", "1.0"); - response.SetHeader("Content-Type", "text/html"); - response.SetHeader("Cache-Control", "no-cache"); - response.SetHeader("Expires", "-1"); - response.SetHeader("Location", "/home"); - - response.SetContent(GetHead("Login") + - "
Unknown Action.
" + - GetBodyClose()); - } - } - - return true; - } -}; - -// +-------------------------------------------------------------------+ -// +-------------------------------------------------------------------+ -// +-------------------------------------------------------------------+ - class NetAdminFile : public NetAdminServlet { public: @@ -462,9 +386,6 @@ NetAdminServer::GetServlet(HttpRequest& request) if (path.indexOf("/chat") == 0) return new NetAdminChat; - if (path.indexOf("/server") == 0) - return new NetAdminServerMgr; - if (path.indexOf("/file") == 0) return new NetAdminFile; @@ -845,27 +766,6 @@ return confirm(\"Are you sure you want to do this?\");\n\ \n\ \n\n"; - content += - " \n\ - \n\ - \n\ - \n\ -

\n\ - Server Admin Functions\n\ -

\n\n\ -\n\ - \n\ - \n\ - \n\ - \n\ - \n\ -\n\ -

\n\ - Restart Server\n\ -

\n\ - Shutdown Server\n\ -

\n\n"; - content += "\n\n"; content += GetCopyright(); return content; diff --git a/StarsEx/StarServer.cpp b/StarsEx/StarServer.cpp index e5462ae..a2c9635 100644 --- a/StarsEx/StarServer.cpp +++ b/StarsEx/StarServer.cpp @@ -349,57 +349,3 @@ StarServer::GameState() Sleep(10); } } - -// +--------------------------------------------------------------------+ - -DWORD WINAPI StarServerShutdownProc(LPVOID link) -{ - StarServer* stars = (StarServer*) link; - - Sleep(3000); - - if (stars) { - stars->Exit(); - return 0; - } - - return (DWORD) E_POINTER; -} - -DWORD WINAPI StarServerRestartProc(LPVOID link) -{ - StarServer* stars = (StarServer*) link; - - Sleep(3000); - - if (stars) { - char cmdline[256]; - strcpy_s(cmdline, "stars -server"); - - STARTUPINFO s; - ZeroMemory(&s, sizeof(s)); - s.cb = sizeof(s); - - PROCESS_INFORMATION pi; - ZeroMemory(&pi, sizeof(pi)); - - CreateProcess("stars.exe", cmdline, 0, 0, 0, 0, 0, 0, &s, &pi); - stars->Exit(); - CloseHandle( pi.hProcess ); - CloseHandle( pi.hThread ); - return 0; - } - - return (DWORD) E_POINTER; -} - -void -StarServer::Shutdown(bool restart) -{ - DWORD thread_id = 0; - - if (restart) - CreateThread(0, 4096, StarServerRestartProc, (LPVOID) this, 0, &thread_id); - else - CreateThread(0, 4096, StarServerShutdownProc, (LPVOID) this, 0, &thread_id); -} \ No newline at end of file diff --git a/StarsEx/StarServer.h b/StarsEx/StarServer.h index a13f278..2164ce0 100644 --- a/StarsEx/StarServer.h +++ b/StarsEx/StarServer.h @@ -46,11 +46,9 @@ public: void SetGameMode(int mode) override; void CreateWorld(); - void Shutdown(bool restart=false); static StarServer* GetInstance() { return instance; } - protected: virtual void UpdateWorld(); virtual void InstantiateMission(); -- cgit v1.1