Merge pull request #633 from Wargus/OnlineService

Online service
Wargus · Mar 14, 2024 · 67353de · 67353de
2 parents 86f4d1b + 3cd8b72
commit 67353de
Show file tree

Hide file tree

Showing 3 changed files with 61 additions and 3 deletions.
diff --git a/src/include/online_service.h b/src/include/online_service.h
@@ -3,6 +3,7 @@
 
 #include "network/netsockets.h"
 
+#include <memory>
 #include <string>
 
 class OnlineContext
@@ -32,7 +33,10 @@ class OnlineContext
 	virtual void reportGameResult() = 0;
 };
 
-extern OnlineContext *OnlineContextHandler;
+extern std::unique_ptr<OnlineContext> OnlineContextHandler;
+
+void InitOnlineService();
+void DeInitOnlineService();
 
 extern void OnlineServiceCclRegister();
 

diff --git a/src/network/online_service.cpp b/src/network/online_service.cpp
@@ -2094,11 +2094,13 @@ class C2S_SID_AUTH_INFO : public OnlineState
 	int retries = 30;
 };
 
-static Context _ctx;
-OnlineContext *OnlineContextHandler = &_ctx;
+std::unique_ptr<OnlineContext> OnlineContextHandler;
 
 static int CclStopAdvertisingOnlineGame(lua_State *l)
 {
+	Assert(OnlineContextHandler);
+	Context &_ctx = dynamic_cast<Context &>(*OnlineContextHandler);
+
 	if (_ctx.isConnected()) {
 		_ctx.stopAdvertising();
 		lua_pushboolean(l, true);
@@ -2110,6 +2112,9 @@ static int CclStopAdvertisingOnlineGame(lua_State *l)
 
 static int CclStartAdvertisingOnlineGame(lua_State *l)
 {
+	Assert(OnlineContextHandler);
+	Context &_ctx = dynamic_cast<Context &>(*OnlineContextHandler);
+
 	if (_ctx.isConnected()) {
 		_ctx.startAdvertising();
 		lua_pushboolean(l, true);
@@ -2121,6 +2126,9 @@ static int CclStartAdvertisingOnlineGame(lua_State *l)
 
 static int CclSetup(lua_State *l)
 {
+	Assert(OnlineContextHandler);
+	Context &_ctx = dynamic_cast<Context &>(*OnlineContextHandler);
+
 	LuaCheckArgs(l, 1);
 	if (!lua_istable(l, 1)) {
 		LuaError(l, "incorrect argument");
@@ -2166,13 +2174,19 @@ static int CclSetup(lua_State *l)
 
 static int CclDisconnect(lua_State *l)
 {
+	Assert(OnlineContextHandler);
+	Context &_ctx = dynamic_cast<Context &>(*OnlineContextHandler);
+
 	LuaCheckArgs(l, 0);
 	_ctx.disconnect();
 	return 0;
 }
 
 static int CclConnect(lua_State *l)
 {
+	Assert(OnlineContextHandler);
+	Context &_ctx = dynamic_cast<Context &>(*OnlineContextHandler);
+
 	_ctx.disconnect();
 	LuaCheckArgs(l, 2);
 	const std::string host = std::string{LuaToString(l, 1)};
@@ -2185,6 +2199,9 @@ static int CclConnect(lua_State *l)
 
 static int CclLogin(lua_State *l)
 {
+	Assert(OnlineContextHandler);
+	Context &_ctx = dynamic_cast<Context &>(*OnlineContextHandler);
+
 	LuaCheckArgs(l, 2);
 	_ctx.setCreateAccount(false);
 	_ctx.setUsername(std::string{LuaToString(l, 1)});
@@ -2194,6 +2211,9 @@ static int CclLogin(lua_State *l)
 
 static int CclSignUp(lua_State *l)
 {
+	Assert(OnlineContextHandler);
+	Context &_ctx = dynamic_cast<Context &>(*OnlineContextHandler);
+
 	LuaCheckArgs(l, 2);
 	_ctx.setCreateAccount(true);
 	_ctx.setUsername(std::string{LuaToString(l, 1)});
@@ -2203,6 +2223,9 @@ static int CclSignUp(lua_State *l)
 
 static int CclStep(lua_State *l)
 {
+	Assert(OnlineContextHandler);
+	Context &_ctx = dynamic_cast<Context &>(*OnlineContextHandler);
+
 	LuaCheckArgs(l, 0);
 	if (_ctx.isDisconnected()) {
 		LuaError(l, "disconnected service cannot step");
@@ -2221,6 +2244,9 @@ static int CclStep(lua_State *l)
 
 static int CclSendMessage(lua_State *l)
 {
+	Assert(OnlineContextHandler);
+	Context &_ctx = dynamic_cast<Context &>(*OnlineContextHandler);
+
 	LuaCheckArgs(l, 1);
 	if (!_ctx.isConnected()) {
 		LuaError(l, "connect first");
@@ -2231,6 +2257,9 @@ static int CclSendMessage(lua_State *l)
 
 static int CclJoinChannel(lua_State *l)
 {
+	Assert(OnlineContextHandler);
+	Context &_ctx = dynamic_cast<Context &>(*OnlineContextHandler);
+
 	LuaCheckArgs(l, 1);
 	if (!_ctx.isConnected()) {
 		LuaError(l, "connect first");
@@ -2241,6 +2270,9 @@ static int CclJoinChannel(lua_State *l)
 
 static int CclJoinGame(lua_State *l)
 {
+	Assert(OnlineContextHandler);
+	Context &_ctx = dynamic_cast<Context &>(*OnlineContextHandler);
+
 	LuaCheckArgs(l, 2);
 	if (!_ctx.isConnected()) {
 		LuaError(l, "connect first");
@@ -2251,6 +2283,9 @@ static int CclJoinGame(lua_State *l)
 
 static int CclStatus(lua_State *l)
 {
+	Assert(OnlineContextHandler);
+	Context &_ctx = dynamic_cast<Context &>(*OnlineContextHandler);
+
 	LuaCheckArgs(l, 0);
 	if (_ctx.isConnected()) {
 		lua_pushstring(l, "connected");
@@ -2270,6 +2305,9 @@ static int CclStatus(lua_State *l)
 
 static int CclRequestUserInfo(lua_State *l)
 {
+	Assert(OnlineContextHandler);
+	Context &_ctx = dynamic_cast<Context &>(*OnlineContextHandler);
+
 	LuaCheckArgs(l, 1);
 	if (!_ctx.isConnected()) {
 		LuaError(l, "not connected");
@@ -2280,11 +2318,24 @@ static int CclRequestUserInfo(lua_State *l)
 
 static int CclPunchNAT(lua_State *l)
 {
+	Assert(OnlineContextHandler);
+	Context &_ctx = dynamic_cast<Context &>(*OnlineContextHandler);
+
 	LuaCheckArgs(l, 1);
 	_ctx.punchNAT(std::string{LuaToString(l, 1)});
 	return 0;
 }
 
+void InitOnlineService()
+{
+	OnlineContextHandler = std::make_unique<Context>();
+}
+
+void DeInitOnlineService()
+{
+	OnlineContextHandler = nullptr;
+}
+
 void OnlineServiceCclRegister()
 {
 	lua_createtable(Lua, 0, 3);

diff --git a/src/stratagus/stratagus.cpp b/src/stratagus/stratagus.cpp
@@ -192,6 +192,7 @@ extern void beos_init(int argc, char **argv);
 #include "map.h"
 #include "netconnect.h"
 #include "network.h"
+#include "online_service.h"
 #include "parameters.h"
 #include "player.h"
 #include "replay.h"
@@ -406,6 +407,7 @@ void Exit(int err)
 	FreeGraphics();
 	FreePlayerColors();
 	FreeButtonStyles();
+	DeInitOnlineService();
 	freeGuichan();
 	fprintf(stdout, "Frames %lu, Slow frames %ld = %ld%%\n",
 			   FrameCounter, SlowFrameCounter,
@@ -758,6 +760,7 @@ try {
 	Map.AllocateTileset();
 	UnitManager = new CUnitManager();
 	FogOfWar = std::make_unique<CFogOfWar>();
+	InitOnlineService();
 
 	LoadCcl(parameters.luaStartFilename, parameters.luaScriptArguments);