repo: update from holylib

Author: RaphaelIT7

source/httpserver.cpp

@@ -4,17 +4,17 @@
 #include "baseclient.h"
 #include "inetchannel.h"
 
-void CallFunc(int func, RequestData* request, ResponseData* response)
+void CallFunc(int func, HttpRequest* request, HttpResponse* response)
 {
 	g_Lua->ReferencePush(func);
 
-	Push_RequestData(request);
-	Push_ResponseData(response);
+	Push_HttpRequest(request);
+	Push_HttpResponse(response);
 
 	g_Lua->PCall(2, 0, 0);
 
-	Delete_RequestData(request);
-	Delete_ResponseData(response); // Destroys the Lua reference after we used it
+	Delete_HttpRequest(request);
+	Delete_HttpResponse(response); // Destroys the Lua reference after we used it
 }
 
 void HttpServer::Start(const char* address, unsigned port)
@@ -52,7 +52,7 @@ void HttpServer::Think()
 			continue;
 		}
 
-		CallFunc(pEntry->iFunction, pEntry, pEntry->pResponseData);
+		CallFunc(pEntry->iFunction, pEntry, &pEntry->pResponseData);
 		pEntry->bHandled = true;
 	}
 
@@ -82,18 +82,17 @@ httplib::Server::Handler HttpServer::CreateHandler(const char* path, int func, b
 			if (!found) { return; }
 		}
 
-		RequestData* request = new RequestData;
+		HttpRequest* request = new HttpRequest;
 		request->strPath = path;
 		request->pRequest = req;
 		request->iFunction = func;
 		request->pResponse = res;
-		request->pResponseData = new ResponseData;
 		m_pRequests.push_back(request); // We should add a check here since we could write to it from multiple threads?
 		m_bUpdate = true;
 		while (!request->bHandled) {
 			ThreadSleep(1);
 		}
-		ResponseData* rdata = request->pResponseData;
+		HttpResponse* rdata = &request->pResponseData;
 		if (rdata->bSetContent) {
 			res.set_content(rdata->strContent, rdata->strContentType);
 		}

source/httpserver.h

@@ -2,7 +2,7 @@
 #include "unordered_map"
 #include "httplib.h"
 
-struct ResponseData {
+struct HttpResponse {
 	bool bSetContent = false;
 	bool bSetRedirect = false;
 	bool bSetHeader = false;
@@ -13,12 +13,12 @@ struct ResponseData {
 	std::unordered_map<std::string, std::string> pHeaders;
 };
 
-struct RequestData {
+struct HttpRequest {
 	bool bHandled = false;
 	bool bDelete = false;
 	int iFunction;
 	std::string strPath;
-	ResponseData* pResponseData;
+	HttpResponse pResponseData;
 	httplib::Response pResponse;
 	httplib::Request pRequest;
 };
@@ -92,6 +92,6 @@ class HttpServer
 	bool m_bUpdate = false;
 	bool m_bInUpdate = false;
 	std::string m_strAddress;
-	std::vector<RequestData*> m_pRequests;
+	std::vector<HttpRequest*> m_pRequests;
 	httplib::Server m_pServer;
 };

source/lua.cpp

@@ -164,36 +164,36 @@ LUA_FUNCTION_STATIC(HttpServer_SetTCPnodelay)
 LUA_FUNCTION_STATIC(HttpServer_SetReadTimeout)
 {
 	HttpServer* pServer = Get_HttpServer(1, true);
-	pServer->GetServer().set_read_timeout(LUA->CheckNumber(2), LUA->CheckNumber(3));
+	pServer->GetServer().set_read_timeout((time_t)LUA->CheckNumber(2), (time_t)LUA->CheckNumber(3));
 	return 0;
 }
 
 LUA_FUNCTION_STATIC(HttpServer_SetWriteTimeout)
 {
 	HttpServer* pServer = Get_HttpServer(1, true);
-	pServer->GetServer().set_write_timeout(LUA->CheckNumber(1), LUA->CheckNumber(2));
+	pServer->GetServer().set_write_timeout((time_t)LUA->CheckNumber(1), (time_t)LUA->CheckNumber(2));
 	return 0;
 }
 
 LUA_FUNCTION_STATIC(HttpServer_SetPayloadMaxLength)
 {
 	HttpServer* pServer = Get_HttpServer(1, true);
-	pServer->GetServer().set_payload_max_length(LUA->CheckNumber(2));
+	pServer->GetServer().set_payload_max_length((size_t)LUA->CheckNumber(2));
 	return 0;
 }
 
 LUA_FUNCTION_STATIC(HttpServer_SetKeepAliveTimeout)
 {
 	HttpServer* pServer = Get_HttpServer(1, true);
-	pServer->GetServer().set_keep_alive_timeout(LUA->CheckNumber(2));
+	pServer->GetServer().set_keep_alive_timeout((time_t)LUA->CheckNumber(2));
 
 	return 0;
 }
 
 LUA_FUNCTION_STATIC(HttpServer_SetKeepAliveMaxCount)
 {
 	HttpServer* pServer = Get_HttpServer(1, true);
-	pServer->GetServer().set_keep_alive_max_count(LUA->CheckNumber(2));
+	pServer->GetServer().set_keep_alive_max_count((size_t)LUA->CheckNumber(2));
 
 	return 0;
 }
@@ -218,7 +218,7 @@ LUA_FUNCTION_STATIC(HttpServer_Start)
 {
 	HttpServer* pServer = Get_HttpServer(1, true);
 	const char* address = LUA->CheckString(2);
-	unsigned port = LUA->CheckNumber(3);
+	unsigned int port = (unsigned int)LUA->CheckNumber(3);
 
 	pServer->Start(address, port);
 
@@ -254,7 +254,7 @@ LUA_FUNCTION_STATIC(httpserver_Destroy)
 
 void LUA_InitServer(GarrysMod::Lua::ILuaBase* LUA)
 {
-	RequestData_LuaInit();
+	HttpRequest_LuaInit();
 
 	HttpServer_TypeID = g_Lua->CreateMetaTable("HttpServer");
 		Util::AddFunc(HttpServer__tostring, "__tostring");

source/main.cpp

@@ -10,14 +10,6 @@ GMOD_MODULE_OPEN()
 	if (Util::server == nullptr)
 		LUA->ThrowError("Failed to get IServer");
 
-	Gmod_Server = InterfacePointers::Server();
-	if (Gmod_Server == nullptr)
-		ThrowError("Failed to get IServer");
-
-	Engine = InterfacePointers::VEngineServer();
-	if (Engine == nullptr)
-		ThrowError("Failed to get IVEngineServer");
-
 	LUA_InitServer(LUA);
 
 	return 0;