ExternalVendorCode/ZeroTierOne
1
0
Fork 0
mirror of https://github.com/zerotier/ZeroTierOne.git synced 2025-05-07 19:18:38 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Manually set DeviceInstanceID since this registry key is missing on Windows Vista and Server 2008.

Browse Source
This commit is contained in:
Adam Ierymenko 2015-08-13 15:52:54 -07:00
parent 085734aaba
commit b75bdedaee
2 changed files with 22 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
osdep/WindowsEthernetTap.cpp
View File

@ -75,6 +75,8 @@ typedef BOOL (WINAPI *SetupDiOpenDeviceInfoA_t)(_In_ HDEVINFO DeviceInfoSet,_In_
typedef BOOL (WINAPI *SetupDiEnumDeviceInfo_t)(_In_ HDEVINFO DeviceInfoSet,_In_ DWORD MemberIndex,_Out_ PSP_DEVINFO_DATA DeviceInfoData); typedef BOOL (WINAPI *SetupDiEnumDeviceInfo_t)(_In_ HDEVINFO DeviceInfoSet,_In_ DWORD MemberIndex,_Out_ PSP_DEVINFO_DATA DeviceInfoData);
typedef BOOL (WINAPI *SetupDiSetClassInstallParamsA_t)(_In_ HDEVINFO DeviceInfoSet,_In_opt_ PSP_DEVINFO_DATA DeviceInfoData,_In_reads_bytes_opt_(ClassInstallParamsSize) PSP_CLASSINSTALL_HEADER ClassInstallParams,_In_ DWORD ClassInstallParamsSize); typedef BOOL (WINAPI *SetupDiSetClassInstallParamsA_t)(_In_ HDEVINFO DeviceInfoSet,_In_opt_ PSP_DEVINFO_DATA DeviceInfoData,_In_reads_bytes_opt_(ClassInstallParamsSize) PSP_CLASSINSTALL_HEADER ClassInstallParams,_In_ DWORD ClassInstallParamsSize);
typedef CONFIGRET (WINAPI *CM_Get_Device_ID_ExA_t)(_In_ DEVINST dnDevInst,_Out_writes_(BufferLen) PSTR Buffer,_In_ ULONG BufferLen,_In_ ULONG ulFlags,_In_opt_ HMACHINE hMachine); typedef CONFIGRET (WINAPI *CM_Get_Device_ID_ExA_t)(_In_ DEVINST dnDevInst,_Out_writes_(BufferLen) PSTR Buffer,_In_ ULONG BufferLen,_In_ ULONG ulFlags,_In_opt_ HMACHINE hMachine);
typedef BOOL (WINAPI *SetupDiGetDeviceInstanceIdA_t)(_In_ HDEVINFO DeviceInfoSet,_In_ PSP_DEVINFO_DATA DeviceInfoData,_Out_writes_opt_(DeviceInstanceIdSize) PSTR DeviceInstanceId,_In_ DWORD DeviceInstanceIdSize,_Out_opt_ PDWORD RequiredSize);
namespace ZeroTier { namespace ZeroTier {
@ -145,6 +147,10 @@ public:
fprintf(stderr,"FATAL: SetupDiSetClassInstallParamsA not found in setupapi.dll\r\n"); fprintf(stderr,"FATAL: SetupDiSetClassInstallParamsA not found in setupapi.dll\r\n");
_exit(1); _exit(1);
} }
if (!(this->SetupDiGetDeviceInstanceIdA = (SetupDiGetDeviceInstanceIdA_t)GetProcAddress(setupApiMod,"SetupDiGetDeviceInstanceIdA"))) {
fprintf(stderr,"FATAL: SetupDiGetDeviceInstanceIdA not found in setupapi.dll\r\n");
_exit(1);
}
newDevMod = LoadLibraryA("newdev.dll"); newDevMod = LoadLibraryA("newdev.dll");
if (!newDevMod) { if (!newDevMod) {
@ -183,6 +189,7 @@ public:
SetupDiOpenDeviceInfoA_t SetupDiOpenDeviceInfoA; SetupDiOpenDeviceInfoA_t SetupDiOpenDeviceInfoA;
SetupDiEnumDeviceInfo_t SetupDiEnumDeviceInfo; SetupDiEnumDeviceInfo_t SetupDiEnumDeviceInfo;
SetupDiSetClassInstallParamsA_t SetupDiSetClassInstallParamsA; SetupDiSetClassInstallParamsA_t SetupDiSetClassInstallParamsA;
SetupDiGetDeviceInstanceIdA_t SetupDiGetDeviceInstanceIdA;
CM_Get_Device_ID_ExA_t CM_Get_Device_ID_ExA; CM_Get_Device_ID_ExA_t CM_Get_Device_ID_ExA;
@ -201,7 +208,7 @@ static Mutex _systemDeviceManagementLock;
} // anonymous namespace } // anonymous namespace
std::string WindowsEthernetTap::addNewPersistentTapDevice(const char *pathToInf) std::string WindowsEthernetTap::addNewPersistentTapDevice(const char *pathToInf,std::string &deviceInstanceId)
{ {
Mutex::Lock _l(_systemDeviceManagementLock); Mutex::Lock _l(_systemDeviceManagementLock);
@ -249,6 +256,12 @@ std::string WindowsEthernetTap::addNewPersistentTapDevice(const char *pathToInf)
return std::string("UpdateDriverForPlugAndPlayDevices() failed (made 60 attempts)"); return std::string("UpdateDriverForPlugAndPlayDevices() failed (made 60 attempts)");
} }
char iidbuf[1024];
DWORD iidReqSize = sizeof(iidbuf);
if (WINENV.SetupDiGetDeviceInstanceIdA(deviceInfoSet,&deviceInfoData,iidbuf,sizeof(iidbuf),&iidReqSize)) {
deviceInstanceId = iidbuf;
} // failure here is not fatal since we only need this on Vista and 2008 -- other versions fill it into the registry automatically
WINENV.SetupDiDestroyDeviceInfoList(deviceInfoSet); WINENV.SetupDiDestroyDeviceInfoList(deviceInfoSet);
return std::string(); return std::string();
@ -531,6 +544,7 @@ WindowsEthernetTap::WindowsEthernetTap(
// If there is no device, try to create one // If there is no device, try to create one
bool creatingNewDevice = (_netCfgInstanceId.length() == 0); bool creatingNewDevice = (_netCfgInstanceId.length() == 0);
std::string newDeviceInstanceId;
if (creatingNewDevice) { if (creatingNewDevice) {
for(int getNewAttemptCounter=0;getNewAttemptCounter<2;++getNewAttemptCounter) { for(int getNewAttemptCounter=0;getNewAttemptCounter<2;++getNewAttemptCounter) {
for(DWORD subkeyIndex=0;;++subkeyIndex) { for(DWORD subkeyIndex=0;;++subkeyIndex) {
@ -583,7 +597,7 @@ WindowsEthernetTap::WindowsEthernetTap(
break; // found an unused zttap device break; // found an unused zttap device
} else { } else {
// no unused zttap devices, so create one // no unused zttap devices, so create one
std::string errm = addNewPersistentTapDevice((std::string(_pathToHelpers) + WINENV.tapDriverPath).c_str()); std::string errm = addNewPersistentTapDevice((std::string(_pathToHelpers) + WINENV.tapDriverPath).c_str(),newDeviceInstanceId);
if (errm.length() > 0) if (errm.length() > 0)
throw std::runtime_error(std::string("unable to create new device instance: ")+errm); throw std::runtime_error(std::string("unable to create new device instance: ")+errm);
} }
@ -604,6 +618,10 @@ WindowsEthernetTap::WindowsEthernetTap(
RegSetKeyValueA(nwAdapters,mySubkeyName.c_str(),"*IfType",REG_DWORD,(LPCVOID)&tmp,sizeof(tmp)); RegSetKeyValueA(nwAdapters,mySubkeyName.c_str(),"*IfType",REG_DWORD,(LPCVOID)&tmp,sizeof(tmp));
if (creatingNewDevice) { if (creatingNewDevice) {
// Vista/2008 does not set this
if (newDeviceInstanceId.length() > 0)
RegSetKeyValueA(nwAdapters,mySubkeyName.c_str(),"DeviceInstanceID",REG_SZ,newDeviceInstanceId.c_str(),(DWORD)newDeviceInstanceId.length());
// Set EnableDHCP to 0 by default on new devices // Set EnableDHCP to 0 by default on new devices
tmp = 0; tmp = 0;
RegSetKeyValueA(nwAdapters,mySubkeyName.c_str(),"EnableDHCP",REG_DWORD,(LPCVOID)&tmp,sizeof(tmp)); RegSetKeyValueA(nwAdapters,mySubkeyName.c_str(),"EnableDHCP",REG_DWORD,(LPCVOID)&tmp,sizeof(tmp));

3
osdep/WindowsEthernetTap.hpp
View File

@ -53,9 +53,10 @@ public:
* Installs a new instance of the ZT tap driver * Installs a new instance of the ZT tap driver
* *
* @param pathToInf Path to zttap driver .inf file * @param pathToInf Path to zttap driver .inf file
* @param deviceInstanceId Buffer to fill with device instance ID on success (and if SetupDiGetDeviceInstanceIdA succeeds, which it should)
* @return Empty string on success, otherwise an error message * @return Empty string on success, otherwise an error message
*/ */
static std::string addNewPersistentTapDevice(const char *pathToInf); static std::string addNewPersistentTapDevice(const char *pathToInf,std::string &deviceInstanceId);
/** /**
* Uninstalls all persistent tap devices that have legacy drivers * Uninstalls all persistent tap devices that have legacy drivers