void/ZeroTierOne
2
0
Fork 0
mirror of https://github.com/zerotier/ZeroTierOne.git synced 2025-06-05 20:13:44 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

call setFriendlyName() after tap adapter is initialized

Browse source
This commit is contained in:
Grant Limberg 2017-10-16 12:16:05 -07:00
parent ee4783e3fb
commit 629a3a2a24
2 changed files with 5 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
osdep/WindowsEthernetTap.cpp
View file

@ -472,6 +472,7 @@ WindowsEthernetTap::WindowsEthernetTap(
_nwid(nwid), _nwid(nwid),
_mtu(mtu), _mtu(mtu),
_tap(INVALID_HANDLE_VALUE), _tap(INVALID_HANDLE_VALUE),
_friendlyName(friendlyName),
_injectSemaphore(INVALID_HANDLE_VALUE), _injectSemaphore(INVALID_HANDLE_VALUE),
_pathToHelpers(hp), _pathToHelpers(hp),
_run(true), _run(true),
@ -1030,6 +1031,8 @@ void WindowsEthernetTap::threadMain()
_initialized = true; _initialized = true;
unsigned int oldmtu = _mtu; unsigned int oldmtu = _mtu;
setFriendlyName(_friendlyName.c_str());
while (_run) { while (_run) {
DWORD waitResult = WaitForMultipleObjectsEx(writeInProgress ? 3 : 2,wait4,FALSE,2500,TRUE); DWORD waitResult = WaitForMultipleObjectsEx(writeInProgress ? 3 : 2,wait4,FALSE,2500,TRUE);
if (!_run) break; // will also break outer while(_run) since _run is false if (!_run) break; // will also break outer while(_run) since _run is false

2
osdep/WindowsEthernetTap.hpp
View file

@ -143,6 +143,8 @@ private:
std::string _deviceInstanceId; std::string _deviceInstanceId;
std::string _mySubkeyName; std::string _mySubkeyName;
std::string _friendlyName;
std::vector<InetAddress> _assignedIps; // IPs assigned with addIp std::vector<InetAddress> _assignedIps; // IPs assigned with addIp
Mutex _assignedIps_m; Mutex _assignedIps_m;