Add fbsbx, improve logger

Author: iostream

src/Logger.h

@@ -4,22 +4,22 @@
 #include <string>
 #include "Config.h"
 
-extern Config g_Config;
 class Logger {
 
 public:
-	~Logger () {
+	Logger (Config* config) {
+		
+		m_isEnable = config->getConfig ("Log");
 		if (m_isEnable) {
-			m_log.flush ();
-			m_log.close ();
+			m_log.open ("blockthespot_log.txt", std::ios::out | std::ios::app);
+			m_log << "BlockTheSpot - Build date: " << __TIMESTAMP__ << std::endl;
 		}
 	}
-	void setLogfile (std::string_view logFile) {
-		m_filename = logFile;
-		m_isEnable = g_Config.getConfig ("Log");
+
+	~Logger () {
 		if (m_isEnable) {
-			m_log.open (m_filename, std::ios::out | std::ios::app);
-			m_log << "BlockTheSpot - Build date: " << __TIMESTAMP__ << std::endl;
+			m_log.flush ();
+			m_log.close ();
 		}
 	}
 
@@ -29,8 +29,7 @@ class Logger {
 	}
 
 private:
-	std::string m_filename;
-	bool m_isEnable;
+	bool m_isEnable = false;
 	std::ofstream m_log;
 
 };

src/Modify.cpp

@@ -31,12 +31,14 @@ BYTE* FindPattern (BYTE* dwAddress, DWORD dwSize, BYTE* pbSig, char* szMask)
 	return 0;
 }
 
-DWORD WINAPI KillBanner (LPVOID)
+DWORD WINAPI KillBanner (LPVOID conf)
 {
+	auto config = static_cast<Config*>(conf);
+	auto* logger = new Logger (config);
 	HMODULE hModule = GetModuleHandle (NULL);
 	MODULEINFO mInfo = { 0 };
 	if (GetModuleInformation (GetCurrentProcess (), hModule, &mInfo, sizeof (MODULEINFO))) {
-
+		logger->Log ("GetModuleInformation OK!");
 		LPVOID skipPod = FindPattern ((uint8_t*)hModule, mInfo.SizeOfImage, (BYTE*)"\x83\xC4\x08\x84\xC0\x0F\x84\x00\x04\x00\x00", "xxxxxxxxxxx");
 
 		if (skipPod)
@@ -49,12 +51,16 @@ DWORD WINAPI KillBanner (LPVOID)
 			VirtualProtect ((char*)skipPod + 6, 1, PAGE_EXECUTE_READWRITE, &oldProtect);
 			memset ((char*)skipPod + 6, 0xE9, 1);
 			VirtualProtect ((char*)skipPod + 6, 1, oldProtect, &oldProtect);
-			g_Logger.Log ("main process - patch success!");
+			logger->Log ("main process - patch success!");
 		}
 		else {
-			g_Logger.Log ("main process - patch failed!");
+			logger->Log ("main process - patch failed!");
 		}
 
+	} 
+	else {
+		logger->Log ("GetModuleInformation failed!");
 	}
+	
 	return 0;
 }

src/Modify.h

@@ -2,4 +2,4 @@
 #include "stdafx.h"
 
 
-DWORD WINAPI KillBanner (LPVOID);
+DWORD WINAPI KillBanner (LPVOID config);

src/dllmain.cpp

@@ -6,10 +6,6 @@
 #include "Modify.h"
 
 extern _getaddrinfo getaddrinfo_orig;
-Logger g_Logger;
-Config g_Config;
-
-
 
 BOOL APIENTRY DllMain (HMODULE hModule,
 					   DWORD  ul_reason_for_call, LPVOID lpReserved)
@@ -21,22 +17,25 @@ BOOL APIENTRY DllMain (HMODULE hModule,
 		switch (ul_reason_for_call)
 		{
 		case DLL_PROCESS_ATTACH:
-			if (std::string_view::npos == procname.find ("--type=") && false == g_Config.getConfig("Block_BannerOnly")) {
+			auto* config = new Config();
+			if (std::string_view::npos == procname.find ("--type=") && false == config->getConfig("Block_BannerOnly")) {
 				// block ads request - main process
-				CreateThread (NULL, NULL, KillBanner, NULL, 0, NULL);
-				g_Logger.setLogfile ("main_log.txt");
+				CreateThread (NULL, NULL, KillBanner, config, 0, NULL);
+				//g_Logger.setLogfile ("main_log.txt");
 			}
 			else if (std::string_view::npos != procname.find ("--type=utility")) {
 				// block ads banner by hostname - utility process
-				g_Logger.setLogfile ("utility_log.txt");
+				//g_Logger.setLogfile ("utility_log.txt");
+				auto* log = new Logger (config);
 				getaddrinfo_orig = getaddrinfo;
 				if (getaddrinfo_orig) {
 					Mhook_SetHook ((PVOID*)&getaddrinfo_orig, getaddrinfo_hook);
-					g_Logger.Log ("Mhook_SetHook - getaddrinfo success!");
+					log->Log ("Mhook_SetHook - getaddrinfo success!");
 				}
 				else {
-					g_Logger.Log ("Mhook_SetHook - getaddrinfo failed!");
+					log->Log ("Mhook_SetHook - getaddrinfo failed!");
 				}
+				log->~Logger ();
 			}
 			break;
 		}

src/hosts.cpp

@@ -2,16 +2,18 @@
 #include "Config.h"
 #include "Logger.h"
 
-extern Logger g_Logger;
-extern Config g_Config;
+//extern Logger g_Logger;
+//extern Config g_Config;
 
 _getaddrinfo getaddrinfo_orig;
 
-const std::vector<std::string_view> blockList = { "google", "doubleclick", "qualaroo.com"/*, "fbsbx.com"*/ };
+const std::vector<std::string_view> blockList = { "google", "doubleclick", "qualaroo.com", "fbsbx.com" };
 
 // check if ads hostname
-bool is_blockhost (std::string_view nodename) {
-	static bool wpad = g_Config.getConfig ("Skip_wpad");
+bool is_blockhost (std::string_view nodename, Config* config) {
+
+	
+	static bool wpad = config->getConfig ("Skip_wpad");
 	if (0 == nodename.compare ("wpad"))
 		return wpad ? true : false;
 	for (auto i : blockList) {
@@ -27,22 +29,25 @@ int WSAAPI getaddrinfo_hook (
 	_In_opt_	const ADDRINFOA* hints,
 	_Out_		PADDRINFOA* res)
 {
+	static auto* config = new Config ();
+	static auto* logger = new Logger (config);
 	if (nodename == nullptr)
 		return getaddrinfo_orig (nodename, servname, hints, res);
 
 	std::string nnodename (nodename);
-	auto isblock = std::async (std::launch::async, is_blockhost, nnodename);
+	
+	auto isblock = std::async (std::launch::async, is_blockhost, nnodename, config);
 	auto result = getaddrinfo_orig (nodename, servname, hints, res);
 	if (0 == result) {
 		if (isblock.get ()) {
 			for (auto ptr = *res; nullptr != ptr; ptr = ptr->ai_next) {
 				auto ipv4 = reinterpret_cast<sockaddr_in*>(ptr->ai_addr);
 				ipv4->sin_addr.S_un.S_addr = INADDR_ANY;
 			}
-			g_Logger.Log ("blocked - " + nnodename);
+			logger->Log ("blocked - " + nnodename);
 		}
 		else {
-			g_Logger.Log ("allowed - " + nnodename);
+			logger->Log ("allowed - " + nnodename);
 		}
 	}
 	return result;