Use map and set instead of vector

Author: Sparky

source/whitelist.cpp

@@ -1,14 +1,15 @@
 #undef getaddrinfo
 
 #include "socket.h"
-#include <vector>
+#include <map>
+#include <set>
 #include <fstream>
 #include <sstream>
 #include <regex>
 
 //Somewhere glua can't read?
 const char* whitelistDir = "../gm_socket_whitelist.txt";
-std::vector<std::pair<std::string, std::string> > whitelist;
+std::map<std::string, std::set<std::string> > whitelist;
 
 enum : int
 {
@@ -28,7 +29,7 @@ int parseWhitelist()
 		std::regex line_parser("([\\w\\.-]+)\\s+(\\d+)(?:(?:\r?\n)+|$)");
 		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()));
+			whitelist[match->operator[](1).str()].insert(match->operator[](2).str());
 		}
 		if (whitelist.empty())
 		{
@@ -44,14 +45,8 @@ int parseWhitelist()
 
 bool isSafe(const char* pNodeName, const char* pServiceName)
 {
-	for(auto i = whitelist.begin(), end = whitelist.end(); i!=end; ++i)
-	{
-		if(i->first == pNodeName && i->second == pServiceName)
-		{
-			return true;
-		}
-	}
-	return false;
+    std::map<std::string, std::set<std::string> >::iterator domain = whitelist.find(pNodeName);
+    return domain != whitelist.end() && domain->second.count(pServiceName)==1;
 }
 
 extern "C" {