diff options
| author | Adam Ierymenko <adam.ierymenko@gmail.com> | 2017-10-24 12:22:02 -0700 |
|---|---|---|
| committer | Adam Ierymenko <adam.ierymenko@gmail.com> | 2017-10-24 12:22:02 -0700 |
| commit | 5a8aa666418cea3b92d458fa2b2ab60ee0ca595f (patch) | |
| tree | ddf335cd2b632aad5857b2228ce05e99a36dc90e | |
| parent | e87ef188265835bd567d58eed1adf6517a1c029c (diff) | |
| parent | 629a3a2a24764e50639c0d4096c929fe6b999714 (diff) | |
| download | infinitytier-5a8aa666418cea3b92d458fa2b2ab60ee0ca595f.tar.gz infinitytier-5a8aa666418cea3b92d458fa2b2ab60ee0ca595f.zip | |
Merge branch 'dev' of http://10.6.6.2/zerotier/ZeroTierOne into dev
| -rw-r--r-- | osdep/WindowsEthernetTap.cpp | 3 | ||||
| -rw-r--r-- | osdep/WindowsEthernetTap.hpp | 2 |
2 files changed, 5 insertions, 0 deletions
diff --git a/osdep/WindowsEthernetTap.cpp b/osdep/WindowsEthernetTap.cpp index 22179cb6..93da8ad6 100644 --- a/osdep/WindowsEthernetTap.cpp +++ b/osdep/WindowsEthernetTap.cpp @@ -472,6 +472,7 @@ WindowsEthernetTap::WindowsEthernetTap( _nwid(nwid), _mtu(mtu), _tap(INVALID_HANDLE_VALUE), + _friendlyName(friendlyName), _injectSemaphore(INVALID_HANDLE_VALUE), _pathToHelpers(hp), _run(true), @@ -1030,6 +1031,8 @@ void WindowsEthernetTap::threadMain() _initialized = true; unsigned int oldmtu = _mtu; + setFriendlyName(_friendlyName.c_str()); + while (_run) { DWORD waitResult = WaitForMultipleObjectsEx(writeInProgress ? 3 : 2,wait4,FALSE,2500,TRUE); if (!_run) break; // will also break outer while(_run) since _run is false diff --git a/osdep/WindowsEthernetTap.hpp b/osdep/WindowsEthernetTap.hpp index 2c7aeadd..70789e75 100644 --- a/osdep/WindowsEthernetTap.hpp +++ b/osdep/WindowsEthernetTap.hpp @@ -143,6 +143,8 @@ private: std::string _deviceInstanceId; std::string _mySubkeyName; + std::string _friendlyName; + std::vector<InetAddress> _assignedIps; // IPs assigned with addIp Mutex _assignedIps_m; |