Got it compiling

Author: thegrb93

projects/premake5.lua

@@ -23,7 +23,7 @@ local LUASOCKET_FOLDER = "../luasocket/src"
 CreateWorkspace({name = "socket.core"})
 	CreateProject({serverside = true, manual_files = true})
 		files("../source/socket.cpp")
-		if whitelist then files("../source/whitelist.cpp") end
+		if whitelist then files("../source/whitelist.cpp") defines({"USE_WHITELIST"}) includedirs(LUASOCKET_FOLDER) end
 		IncludeLuaShared()
 		links("socket")
 
@@ -32,7 +32,7 @@ CreateWorkspace({name = "socket.core"})
 
 	CreateProject({serverside = false, manual_files = true})
 		files("../source/socket.cpp")
-		if whitelist then files("../source/whitelist.cpp") end
+		if whitelist then files("../source/whitelist.cpp") defines({"USE_WHITELIST"}) includedirs(LUASOCKET_FOLDER) end
 		IncludeLuaShared()
 		links("socket")
 

source/socket.cpp

@@ -2,8 +2,17 @@
 
 extern "C" int luaopen_socket_core( lua_State *state );
 
+int parseWhitelist(GarrysMod::Lua::ILuaBase* LUA);
+
 GMOD_MODULE_OPEN( )
 {
+	#ifdef USE_WHITELIST
+	if (parseWhitelist(LUA))
+	{
+		return 0;
+	}
+	#endif
+
 	if( luaopen_socket_core( LUA->GetState( ) ) == 1 )
 	{
 		LUA->Push( -1 );

source/whitelist.cpp

@@ -1,27 +1,47 @@
 #undef getaddrinfo
 
+#include <GarrysMod/Lua/Interface.h>
+
 #include "socket.h"
 #include <vector>
 #include <fstream>
+#include <sstream>
 #include <regex>
 
+const char* whitelistDir = "../gm_socket_whitelist.txt";
 std::vector<std::pair<std::string, std::string> > whitelist;
 
-void parseWhitelist()
+int parseWhitelist(GarrysMod::Lua::ILuaBase* LUA)
 {
 	//Somewhere glua can't read?
-	std::ifstream input("../../../gm_socket_whitelist.txt");
+	std::ifstream input(whitelistDir);
 	if(input)
 	{
+		std::stringstream filereader;
+		filereader << input.rdbuf();
+		std::string filedata = filereader.str();
 		std::regex line_parser("([\\w\\.-]+)\\s+(\\d+)(?:(?:\r?\n)+|$)");
-		for (std::sregex_iterator match = std::sregex_iterator(std::istreambuf_iterator<char>(input), std::istreambuf_iterator<char>(), line_parser), end = std::sregex_iterator(); match != end; ++match)
+		for (std::regex_iterator<std::string::iterator> match = std::regex_iterator(filedata.begin(), filedata.end(), line_parser), end = std::regex_iterator<std::string::iterator>(); match != end; ++match)
+		{
+			whitelist.push_back(std::pair<std::string, std::string>(match->operator[](1).str(), match->operator[](2).str()));
+		}
+		if (whitelist.empty())
 		{
-			whitelist.push_back(std::pair<std::string, std::string>(match->operator[](1).str(), match->operator[](2).str());
+			LUA->PushString("Didn't find any valid entries in whitelist file!");
+			LUA->Error();
+			return 1;
 		}
 	}
+	else
+	{
+		LUA->PushString("Failed to read whitelist file!");
+		LUA->Error();
+		return 1;
+	}
+	return 0;
 }
 
-bool isSafe(unsigned char* pNodeName, unsigned char* pServiceName)
+bool isSafe(const char* pNodeName, const char* pServiceName)
 {
 	for(auto i = whitelist.begin(), end = whitelist.end(); i!=end; ++i)
 	{
@@ -35,12 +55,12 @@ bool isSafe(unsigned char* pNodeName, unsigned char* pServiceName)
 
 extern "C" {
 
-#ifdef WIN32_
+#ifdef _WIN32
 	INT WSAAPI __wrap_getaddrinfo(
 		_In_opt_        PCSTR               pNodeName,
 		_In_opt_        PCSTR               pServiceName,
 		_In_opt_        const ADDRINFOA *   pHints,
-		_Outptr_        PADDRINFOA *        ppResult
+		_Outptr_result_maybenull_        PADDRINFOA *        ppResult
 	)
 #else
 	int __wrap_getaddrinfo (__const char *__restrict pNodeName,
@@ -55,6 +75,7 @@ extern "C" {
 		}
 		else
 		{
+			*ppResult = nullptr;
 			return EAI_FAIL;
 		}
 	}