Update to provide better support to sustained intensive network usage…

…s (Such as FiveM..)

GRE.cpp

@@ -1,13 +1,15 @@
 #include "GRE.h"
 
+#define RecvBufSize 32768
+
 [[noreturn]] void GRE::receiver(HMODULE wintun) {
 	InitializeWintun(wintun); // Required due to being initialized in another file and wintun won't provide any .lib
 
 	sockaddr_in SenderAddr{};
 	int SenderAddrSize = sizeof(SenderAddr);
 
-	char RecvBuf[8192];
-	int BufLen = 8192;
+	char RecvBuf[RecvBufSize];
+	int BufLen = RecvBufSize;
 	int rBufLen;
 	el::Logger* defaultLogger = el::Loggers::getLogger("default");
 
@@ -76,7 +78,7 @@
 				Session = WintunStartSession(Adapter, WINTUN_MAX_RING_CAPACITY / 2);
 
 				if (!Session) {
-					WintunFreeAdapter(Adapter);
+					WintunCloseAdapter(Adapter);
 					LOG(FATAL) << "Could not create session";
 				}
 				LOG(INFO) << "Successfully restarted WinTun Session.";

GRE.h

@@ -9,7 +9,7 @@
 
 #define IPPROTO_GRE 47
 #define GRE_SIZE 4
-#define SEND_BUFFER 16384
+#define SEND_BUFFER 32768
 extern bool reset_adapter;
 extern WINTUN_SESSION_HANDLE Session;
 extern WINTUN_ADAPTER_HANDLE Adapter;

GRETunnel.cpp

@@ -7,6 +7,7 @@
 #include <WS2tcpip.h>
 #include <thread>
 #include <filesystem>
+#include "include/wintun.h"
 
 #include "wintun_helper.h"
 #include "GRE.h"
@@ -37,18 +38,6 @@ INITIALIZE_EASYLOGGINGPP
 int main(int argc, char* argv[])
 {
 	std::cout << "GRE Tunnel for Windows" << std::endl << std::endl;
-	if (strcmp(argv[1], "reset") == 0)
-	{
-		HMODULE MWintun = wt_LoadModule();
-		if (!InitializeWintun(MWintun)) {
-			std::cerr << "Failed to initialize WinTun: " << GetLastError() << std::endl <<
-				"Please make sure that wintun.dll exists" << std::endl;
-			return 0;
-		}
-		std::cout << "Reseting adapters" << std::endl;
-		WintunEnumAdapters(L"GRE_Tun", delete_callback, NULL);
-		return 0;
-	}
 	if (argc < 5 || argc > 7) {
 		std::cerr << "At least 2 arguments must be given" << std::endl <<
 			"Arguments: gre_tunnel.exe GRE_BIND_IP GRE_SERVER INTERFACE_IP GATEWAY_IP [CIDR (30)] [ADAPTER_NAME]" << std::endl;
@@ -104,13 +93,10 @@ int main(int argc, char* argv[])
 		return 0;
 	}
 
-	Adapter = WintunOpenAdapter(L"GRE_Tun", adapter_name);
+	Adapter = WintunCreateAdapter(L"GRE_Tunnel", adapter_name, NULL);
 	if (!Adapter) {
-		Adapter = WintunCreateAdapter(L"GRE_Tun", adapter_name, NULL, FALSE);
-		if (!Adapter) {
-			LOG(FATAL) << "Failed to create Wintun adapter: " << GetLastError();
-			return 0;
-		}
+		LOG(FATAL) << "Failed to create Wintun adapter: " << GetLastError();
+		return 0;
 	}
 
 	SetConsoleCtrlHandler(exit_handler, TRUE);
@@ -121,22 +107,22 @@ int main(int argc, char* argv[])
 	AddressRow.Address.Ipv4.sin_family = AF_INET;
 	inet_pton(AF_INET, bind_ip, &AddressRow.Address.Ipv4.sin_addr.S_un.S_addr);
 
-	AddressRow.OnLinkPrefixLength = 30;
+	AddressRow.OnLinkPrefixLength = cidr;
 	AddressRow.DadState = IpDadStatePreferred;
 	auto LastError = CreateUnicastIpAddressEntry(&AddressRow);
 
 	if (LastError != ERROR_SUCCESS && LastError != ERROR_OBJECT_ALREADY_EXISTS)
 	{
 		LOG(FATAL) << "Failed to assign IP: " << LastError;
-		WintunFreeAdapter(Adapter);
+		WintunCloseAdapter(Adapter);
 		return 0;
 	}
 
-	Session = WintunStartSession(Adapter, WINTUN_MAX_RING_CAPACITY / 2);
+	Session = WintunStartSession(Adapter, WINTUN_MAX_RING_CAPACITY);
 	if (!Session)
 	{
 		LOG(FATAL) << "Failed to create adapter";
-		WintunFreeAdapter(Adapter);
+		WintunCloseAdapter(Adapter);
 		return 0;
 	}
 

GRETunnel.vcxproj

@@ -151,7 +151,7 @@
       <SDLCheck>true</SDLCheck>
       <PreprocessorDefinitions>NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <ConformanceMode>true</ConformanceMode>
-      <AdditionalIncludeDirectories>wintun\include\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>include\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <LanguageStandard>stdcpp17</LanguageStandard>
       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
       <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>

GRETunnel.vcxproj.filters

@@ -39,7 +39,7 @@
       <Filter>Fichiers d%27en-tête</Filter>
     </ClInclude>
     <ClInclude Include="wintun.h">
-      <Filter>Fichiers sources</Filter>
+      <Filter>Fichiers d%27en-tête</Filter>
     </ClInclude>
   </ItemGroup>
   <ItemGroup>