Progress

Author: Sparky

source/whitelist.cpp

@@ -2,18 +2,30 @@
 
 #include "socket.h"
 #include <vector>
+#include <fstream>
+#include <regex>
 
 std::vector<std::pair<std::string, std::string> > whitelist;
 
 void parseWhitelist()
 {
+	//Somewhere glua can't read?
+	std::ifstream input("../../../gm_socket_whitelist.txt");
+	if(input)
+	{
+		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)
+		{
+			whitelist.push_back(std::pair<std::string, std::string>(match->operator[](1).str(), match->operator[](2).str());
+		}
+	}
 }
 
 bool isSafe(unsigned char* pNodeName, unsigned char* pServiceName)
 {
 	for(auto i = whitelist.begin(), end = whitelist.end(); i!=end; ++i)
 	{
-		if(i->first == NodeStr && i->second == pServiceName)
+		if(i->first == pNodeName && i->second == pServiceName)
 		{
 			return true;
 		}
@@ -23,12 +35,19 @@ bool isSafe(unsigned char* pNodeName, unsigned char* pServiceName)
 
 extern "C" {
 
+#ifdef WIN32_
 	WINSOCK_API_LINKAGE INT WSAAPI __wrap_getaddrinfo(
 		_In_opt_        PCSTR               pNodeName,
 		_In_opt_        PCSTR               pServiceName,
 		_In_opt_        const ADDRINFOA *   pHints,
 		_Outptr_        PADDRINFOA *        ppResult
 	)
+#else
+	extern int __wrap_getaddrinfo (__const char *__restrict pNodeName,
+		__const char *__restrict pServiceName,
+		__const struct addrinfo *__restrict pHints,
+		struct addrinfo **__restrict ppResult)
+#endif
 	{
 		if(isSafe(pNodeName, pServiceName))
 		{
@@ -40,4 +59,4 @@ extern "C" {
 		}
 	}
 
-}
+}