diff options
| author | Christian Pointner <equinox@anytun.org> | 2009-01-31 14:35:33 +0000 |
|---|---|---|
| committer | Christian Pointner <equinox@anytun.org> | 2009-01-31 14:35:33 +0000 |
| commit | 2b5726ccf83d4dec16d582e4a9b51a0a76938e65 (patch) | |
| tree | 4b64a7218cdfe79e7e3d1083548cb989c0c8ae2f /src/win32 | |
| parent | started to port bsd tundevice to new ifconfig feature (diff) | |
some fixes for tunDevice on Windows Vista
Diffstat (limited to 'src/win32')
| -rw-r--r-- | src/win32/registryKey.cpp | 2 | ||||
| -rw-r--r-- | src/win32/tunDevice.cpp | 29 |
2 files changed, 13 insertions, 18 deletions
diff --git a/src/win32/registryKey.cpp b/src/win32/registryKey.cpp index f0ab73d..7112745 100644 --- a/src/win32/registryKey.cpp +++ b/src/win32/registryKey.cpp @@ -108,7 +108,7 @@ DWORD RegistryKey::getSubKey(DWORD index, RegistryKey& subKey, REGSAM sam) const { char subkeyname[NAME_LENGTH]; DWORD len = sizeof(subkeyname); - DWORD err = RegEnumKeyEx(key_, index, subkeyname, &len, NULL, NULL, NULL, NULL); + DWORD err = RegEnumKeyEx(key_, index, subkeyname, &len, NULL, NULL, NULL, NULL); if(err != ERROR_SUCCESS) return err; diff --git a/src/win32/tunDevice.cpp b/src/win32/tunDevice.cpp index 850711d..9b8e087 100644 --- a/src/win32/tunDevice.cpp +++ b/src/win32/tunDevice.cpp @@ -119,7 +119,7 @@ bool TunDevice::getAdapter(std::string const& dev_name) DWORD err = akey.open(HKEY_LOCAL_MACHINE, ADAPTER_KEY, KEY_ENUMERATE_SUB_KEYS); if(err != ERROR_SUCCESS) { std::stringstream msg; - msg << "Unable to open registry key: " << LogErrno(err); + msg << "Unable to open registry key (HKLM\\" << ADAPTER_KEY << "): " << LogErrno(err); throw std::runtime_error(msg.str()); } @@ -128,15 +128,12 @@ bool TunDevice::getAdapter(std::string const& dev_name) RegistryKey ckey; DWORD err = akey.getSubKey(i, ckey, KEY_QUERY_VALUE); if(err == ERROR_NO_MORE_ITEMS) - break; - if(err != ERROR_SUCCESS) { - std::stringstream msg; - msg << "Unable to read registry: " << LogErrno(err); - throw std::runtime_error(msg.str()); - } + break; + if(err != ERROR_SUCCESS) + continue; try { - if(ckey["ComponentId"] != TAP_COMPONENT_ID) + if(ckey["ComponentId"] != TAP_COMPONENT_ID) continue; actual_node_ = ckey["NetCfgInstanceId"]; @@ -144,13 +141,11 @@ bool TunDevice::getAdapter(std::string const& dev_name) std::stringstream keyname; keyname << NETWORK_CONNECTIONS_KEY << "\\" << actual_node_ << "\\Connection"; err = nkey.open(HKEY_LOCAL_MACHINE, keyname.str().c_str(), KEY_QUERY_VALUE);; - if(err != ERROR_SUCCESS) { - std::stringstream msg; - msg << "Unable to open registry key: " << LogErrno(err); - throw std::runtime_error(msg.str()); - } - actual_name_ = nkey["Name"]; - } catch(LogErrno& e) { continue; } + if(err != ERROR_SUCCESS) + continue; + + actual_name_ = nkey["Name"]; + } catch(LogErrno& e) { continue; } if(dev_name != "") { if(dev_name == actual_name_) { @@ -161,10 +156,10 @@ bool TunDevice::getAdapter(std::string const& dev_name) else { std::stringstream tapname; tapname << USERMODEDEVICEDIR << actual_node_ << TAPSUFFIX; - handle_ = CreateFile(tapname.str().c_str(), GENERIC_WRITE | GENERIC_READ, 0, 0, OPEN_EXISTING, FILE_ATTRIBUTE_SYSTEM | FILE_FLAG_OVERLAPPED, 0); + handle_ = CreateFile(tapname.str().c_str(), GENERIC_WRITE | GENERIC_READ, 0, 0, OPEN_EXISTING, FILE_ATTRIBUTE_SYSTEM | FILE_FLAG_OVERLAPPED, 0); if(handle_ == INVALID_HANDLE_VALUE) continue; - found = true; + found = true; break; } } |