DEV9: rewrite TAP driver and switch to TAP for windows

plugins/dev9ghzdrk/Win32/Win32.cpp

@@ -172,8 +172,7 @@ UINT DEV9ThreadProc() {
 }*/
 NetAdapter* GetNetAdapter()
 {
-	NetAdapter* na;
+	NetAdapter* na = static_cast<NetAdapter*>(new TAPAdapter());
-	na = (config.Eth[0]=='t') ? static_cast<NetAdapter*>(new TAPAdapter()) : static_cast<NetAdapter*>(new PCAPAdapter());
 
 	if (!na->isInitialised())
 	{

plugins/dev9ghzdrk/Win32/tap-win32.cpp

@@ -28,6 +28,7 @@
  */
 #include <stdio.h>
 #include <windows.h>
+#include <tchar.h>
 #include "tap.h"
 #include "..\dev9.h"
 #include <string>
@@ -64,245 +65,147 @@
 #define USERMODEDEVICEDIR "\\\\.\\Global\\"
 #define TAPSUFFIX         ".tap"
 
-#define TAP_COMPONENT_ID "tap0801"
+#define TAP_COMPONENT_ID "tap0901"
 
-vector<string>* get_tap_reg ()
+bool IsTAPDevice(const TCHAR* guid)
 {
-  vector<string>* names = new vector<string>();
+	HKEY netcard_key;
-  HKEY adapter_key;
+	LONG status;
-  LONG status;
+	DWORD len;
-  DWORD len;
+	int i = 0;
 
-  int i = 0;
+	status = RegOpenKeyEx(HKEY_LOCAL_MACHINE, ADAPTER_KEY, 0, KEY_READ, &netcard_key);
 
-  status = RegOpenKeyEx(
+	if (status != ERROR_SUCCESS)
-			HKEY_LOCAL_MACHINE,
+		return false;
-			ADAPTER_KEY,
-			0,
-			KEY_READ,
-			&adapter_key);
 
-  if (status != ERROR_SUCCESS)
+	for (;;)
-    printf ( "Error opening registry key: %s", ADAPTER_KEY);
-
-  while (true)
-    {
-      char enum_name[256];
-      char unit_string[256];
-      HKEY unit_key;
-      char component_id_string[] = "ComponentId";
-      char component_id[256];
-      char net_cfg_instance_id_string[] = "NetCfgInstanceId";
-      char net_cfg_instance_id[256];
-      DWORD data_type;
-
-      len = sizeof (enum_name);
-      status = RegEnumKeyEx(
-			    adapter_key,
-			    i,
-			    enum_name,
-			    &len,
-			    NULL,
-			    NULL,
-			    NULL,
-			    NULL);
-      if (status == ERROR_NO_MORE_ITEMS)
-	break;
-      else if (status != ERROR_SUCCESS)
-	printf ( "Error enumerating registry subkeys of key: %s",
-	     ADAPTER_KEY);
-
-	  _snprintf (unit_string, sizeof(unit_string), "%s\\%s",
-			ADAPTER_KEY, enum_name);
-
-      status = RegOpenKeyEx(
-			    HKEY_LOCAL_MACHINE,
-			    unit_string,
-			    0,
-			    KEY_READ,
-			    &unit_key);
-
-      if (status != ERROR_SUCCESS)
-	printf ( "Error opening registry key: %s", unit_string);
-      else
 	{
-	  len = sizeof (component_id);
+		TCHAR enum_name[256];
-	  status = RegQueryValueEx(
+		TCHAR unit_string[256];
-				   unit_key,
+		HKEY unit_key;
-				   component_id_string,
+		TCHAR component_id_string[] = _T("ComponentId");
-				   NULL,
+		TCHAR component_id[256];
-				   &data_type,
+		TCHAR net_cfg_instance_id_string[] = _T("NetCfgInstanceId");
-				   (LPBYTE)component_id,
+		TCHAR net_cfg_instance_id[256];
-				   &len);
+		DWORD data_type;
 
-	  if (status != ERROR_SUCCESS || data_type != REG_SZ)
+		len = sizeof(enum_name);
-	    printf ( "Error opening registry key: %s\\%s",
+		status = RegEnumKeyEx(netcard_key, i, enum_name, &len, nullptr, nullptr, nullptr, nullptr);
-		 unit_string, component_id_string);
-	  else
-	    {	      
-	      len = sizeof (net_cfg_instance_id);
-	      status = RegQueryValueEx(
-				       unit_key,
-				       net_cfg_instance_id_string,
-				       NULL,
-				       &data_type,
-				       (LPBYTE)net_cfg_instance_id,
-				       &len);
 
-			if (status == ERROR_SUCCESS && data_type == REG_SZ)
+		if (status == ERROR_NO_MORE_ITEMS)
+			break;
+		else if (status != ERROR_SUCCESS)
+			return false;
+
+		_sntprintf(unit_string, sizeof(unit_string), _T("%s\\%s"), ADAPTER_KEY, enum_name);
+
+		status = RegOpenKeyEx(HKEY_LOCAL_MACHINE, unit_string, 0, KEY_READ, &unit_key);
+
+		if (status != ERROR_SUCCESS)
+		{
+			return false;
+		}
+		else
+		{
+			len = sizeof(component_id);
+			status = RegQueryValueEx(unit_key, component_id_string, nullptr, &data_type,
+									 (LPBYTE)component_id, &len);
+
+			if (!(status != ERROR_SUCCESS || data_type != REG_SZ))
 			{
-				if(!memcmp(component_id, "tap",3))
+				len = sizeof(net_cfg_instance_id);
-				{
+				status = RegQueryValueEx(unit_key, net_cfg_instance_id_string, nullptr, &data_type,
-					printf("*** Found possible tap adapter: %s\n",component_id);
+										 (LPBYTE)net_cfg_instance_id, &len);
 
-					int version = atoi(component_id+3);
+				if (status == ERROR_SUCCESS && data_type == REG_SZ)
-					if(version>=800)
+				{
+					// tap_ovpnconnect, tap0901 or root\tap, no clue why
+					if (!strncmp(component_id, "tap", 3) || !strncmp(component_id, "root\\tap", 8))
 					{
-						names->push_back(net_cfg_instance_id);
+						RegCloseKey(unit_key);
+						RegCloseKey(netcard_key);
+						return true;
 					}
 				}
 			}
-	    }
+			RegCloseKey(unit_key);
-	  RegCloseKey (unit_key);
+		}
+		++i;
 	}
-      ++i;
-    }
 
-  RegCloseKey (adapter_key);
+	RegCloseKey(netcard_key);
-  return names;
+	return false;
 }
 
-struct temp_11{string name;string guid;};
-vector<temp_11>*  get_panel_reg ()
-{
-  LONG status;
-  HKEY network_connections_key;
-  DWORD len;
-  vector<temp_11>* names = new vector<temp_11>();
-  int i = 0;
-
-  status = RegOpenKeyEx(
-			HKEY_LOCAL_MACHINE,
-			NETWORK_CONNECTIONS_KEY,
-			0,
-			KEY_READ,
-			&network_connections_key);
-
-  if (status != ERROR_SUCCESS)
-    printf ( "Error opening registry key: %s", NETWORK_CONNECTIONS_KEY);
-
-  while (true)
-    {
-      char enum_name[256];
-      char connection_string[256];
-      HKEY connection_key;
-      char name_data[256];
-      DWORD name_type;
-      const char name_string[] = "Name";
-
-      len = sizeof (enum_name);
-      status = RegEnumKeyEx(
-			    network_connections_key,
-			    i,
-			    enum_name,
-			    &len,
-			    NULL,
-			    NULL,
-			    NULL,
-			    NULL);
-      if (status == ERROR_NO_MORE_ITEMS)
-	break;
-      else if (status != ERROR_SUCCESS)
-	printf ( "Error enumerating registry subkeys of key: %s",
-	     NETWORK_CONNECTIONS_KEY);
-
-      _snprintf (connection_string, sizeof(connection_string),
-			"%s\\%s\\Connection",
-			NETWORK_CONNECTIONS_KEY, enum_name);
-
-      status = RegOpenKeyEx(
-			    HKEY_LOCAL_MACHINE,
-			    connection_string,
-			    0,
-			    KEY_READ,
-			    &connection_key);
-
-      if (status != ERROR_SUCCESS)
-	printf ( "Error opening registry key: %s", connection_string);
-      else
-	{
-	  len = sizeof (name_data);
-	  status = RegQueryValueEx(
-				   connection_key,
-				   name_string,
-				   NULL,
-				   &name_type,
-				   (LPBYTE)name_data,
-				   &len);
-
-	  if (status != ERROR_SUCCESS || name_type != REG_SZ)
-	    printf ( "Error opening registry key: %s\\%s\\%s",
-		 NETWORK_CONNECTIONS_KEY, connection_string, name_string);
-	  else
-	    {
-		  temp_11 t = {name_data,enum_name};
-		  names->push_back(t);
-
-	    }
-	  RegCloseKey (connection_key);
-	}
-      ++i;
-    }
-
-  RegCloseKey (network_connections_key);
-
-  return names;
-}
-
-
 vector<tap_adapter>* GetTapAdapters()
 {
-	vector<tap_adapter>* rv = new vector<tap_adapter>();
+	vector<tap_adapter>* tap_nic = new vector<tap_adapter>();
-	int links;
+	LONG status;
+	HKEY control_net_key;
+	DWORD len;
+	DWORD cSubKeys = 0;
 
-	vector<string> *tap_reg = get_tap_reg ();
+	status = RegOpenKeyEx(HKEY_LOCAL_MACHINE, NETWORK_CONNECTIONS_KEY, 0, KEY_READ | KEY_QUERY_VALUE,
-	vector<temp_11> *panel_reg = get_panel_reg ();
+						  &control_net_key);
 
-	printf ( "\nAvailable TAP-WIN32 adapters [name, GUID]:\n");
+	if (status != ERROR_SUCCESS)
+		return false;
 
-	/* loop through each TAP-Win32 adapter registry entry */
+	status = RegQueryInfoKey(control_net_key, nullptr, nullptr, nullptr, &cSubKeys, nullptr, nullptr,
-	for (size_t i = 0; i<tap_reg->size();i++)
+							 nullptr, nullptr, nullptr, nullptr, nullptr);
+
+	if (status != ERROR_SUCCESS)
+		return false;
+
+	for (DWORD i = 0; i < cSubKeys; i++)
 	{
-		links = 0;
+		TCHAR enum_name[256];
+		TCHAR connection_string[256];
+		HKEY connection_key;
+		TCHAR name_data[256];
+		DWORD name_type;
+		const TCHAR name_string[] = _T("Name");
 
-		/* loop through each network connections entry in the control panel */
+		len = sizeof(enum_name);
-		for (size_t j = 0; j<panel_reg->size();j++)
+		status = RegEnumKeyEx(control_net_key, i, enum_name, &len, nullptr, nullptr, nullptr, nullptr);
+
+		if (status != ERROR_SUCCESS)
+			continue;
+
+		_sntprintf(connection_string, sizeof(connection_string), _T("%s\\%s\\Connection"),
+				   NETWORK_CONNECTIONS_KEY, enum_name);
+
+		status = RegOpenKeyEx(HKEY_LOCAL_MACHINE, connection_string, 0, KEY_READ, &connection_key);
+
+		if (status == ERROR_SUCCESS)
 		{
-			if (!strcmp ((*tap_reg)[i].c_str(), (*panel_reg)[j].guid.c_str()))
+			len = sizeof(name_data);
+			status = RegQueryValueEx(connection_key, name_string, nullptr, &name_type, (LPBYTE)name_data,
+									 &len);
+
+			if (status != ERROR_SUCCESS || name_type != REG_SZ)
 			{
-				//printf ("'%s' %s\n", (*panel_reg)[j].name.c_str(),(*tap_reg)[i].c_str());
+				continue;
-				tap_adapter t = { (*panel_reg)[j].name,(*tap_reg)[i]};
+			}
-				t.guid= string("tap:") + t.guid;
+			else
-				t.name=string("tap:") + t.name;
+			{
-				rv->push_back(t);
+				if (IsTAPDevice(enum_name))
-				++links;
+				{
+					std::string tmp = name_data;
+					std::string tmp2 = enum_name;
+					tap_adapter t = {tmp, tmp2};
+					tap_nic->push_back(t);
+				}
 			}
-		}
 
-		if (links > 1)
+			RegCloseKey(connection_key);
-		{
-			//warn_panel_dup = true;
-		}
-		else if (links == 0)
-		{
-			/* a TAP adapter exists without a link from the network
-			connections control panel */
-//			warn_panel_null = true;
-			printf ("[NULL] %s\n",(*tap_reg)[i].c_str());
 		}
 	}
-	delete tap_reg,panel_reg;
+
-	return rv;
+	RegCloseKey(control_net_key);
+
+	return tap_nic;
 }
 
 //Set the connection status
@@ -364,7 +267,11 @@ HANDLE TAPOpen(const char *device_guid)
 
 TAPAdapter::TAPAdapter()
 {
-	htap=TAPOpen(config.Eth+4);
+	if (config.ethEnable == 0)
+		return;
+	htap = TAPOpen(config.Eth);
+	if (htap == INVALID_HANDLE_VALUE)
+		SysMessage("Can't open Device '%s'\n", config.Eth);
 
     read.Offset = 0;
     read.OffsetHigh = 0;

plugins/dev9ghzdrk/pcap_io.cpp

@@ -17,6 +17,7 @@
 #ifdef _WIN32
 #include <winsock2.h>
 #include <iphlpapi.h>
+#include <ws2tcpip.h>
 #include <windows.h>
 #include <comdef.h>
 #elif defined(__linux__)
@@ -267,31 +268,16 @@ void pcap_io_close()
 	#endif
 }
 
+void displayAddress(const SOCKET_ADDRESS& Address)
+{
+
+}
+
 
 int pcap_io_get_dev_num()
 { 
 	#ifdef _WIN32
-	static IP_ADAPTER_ADDRESSES AdapterInfo[128];
+	return 0;
-	static PIP_ADAPTER_ADDRESSES pAdapterInfo;
-	ULONG dwBufLen = sizeof(AdapterInfo);
-	int i = 0;
-
-	DWORD dwStatus = GetAdaptersAddresses(
-		AF_UNSPEC,
-		GAA_FLAG_INCLUDE_PREFIX,
-		NULL,
-		AdapterInfo,
-		&dwBufLen);
-	if (dwStatus != ERROR_SUCCESS)
-		return 0;
-
-	pAdapterInfo = AdapterInfo;
-	do
-	{
-		pAdapterInfo = pAdapterInfo->Next;
-		i++;
-	} while (pAdapterInfo);
-	return i;
 	#elif
 	pcap_if_t *alldevs;
 	pcap_if_t *d;
@@ -315,28 +301,6 @@ int pcap_io_get_dev_num()
 char* pcap_io_get_dev_name(int num)
 {
 	#ifdef _WIN32
-	static IP_ADAPTER_ADDRESSES AdapterInfo[128];
-	static PIP_ADAPTER_ADDRESSES pAdapterInfo;
-	ULONG dwBufLen = sizeof(AdapterInfo);
-	int i = 0;
-
-	DWORD dwStatus = GetAdaptersAddresses(
-		AF_UNSPEC,
-		GAA_FLAG_INCLUDE_PREFIX,
-		NULL,
-		AdapterInfo,
-		&dwBufLen);
-	if (dwStatus != ERROR_SUCCESS)
-		return 0;
-
-	pAdapterInfo = AdapterInfo;
-	do
-	{
-		if (i == num)
-			return pAdapterInfo->AdapterName;
-		pAdapterInfo = pAdapterInfo->Next;
-		i++;
-	} while (pAdapterInfo);
 	#elif
 	pcap_if_t *alldevs;
 	pcap_if_t *d;
@@ -366,31 +330,6 @@ char* pcap_io_get_dev_name(int num)
 char* pcap_io_get_dev_desc(int num)
 {
 	#ifdef _WIN32
-	static IP_ADAPTER_ADDRESSES AdapterInfo[128];
-	static PIP_ADAPTER_ADDRESSES pAdapterInfo;
-	ULONG dwBufLen = sizeof(AdapterInfo);
-	int i = 0;
-
-	DWORD dwStatus = GetAdaptersAddresses(
-		AF_UNSPEC,
-		GAA_FLAG_INCLUDE_PREFIX,
-		NULL,
-		AdapterInfo,
-		&dwBufLen);
-	if (dwStatus != ERROR_SUCCESS)
-		return 0;
-
-	pAdapterInfo = AdapterInfo;
-	do
-	{
-		if (i == num)
-		{
-			_bstr_t b(pAdapterInfo->Description);
-			return b;
-		}
-		pAdapterInfo = pAdapterInfo->Next;
-		i++;
-	} while (pAdapterInfo);
 	#elif
 	pcap_if_t *alldevs;
 	pcap_if_t *d;