From 629a3a2a24764e50639c0d4096c929fe6b999714 Mon Sep 17 00:00:00 2001
From: Grant Limberg <grant.limberg@zerotier.com>
Date: Mon, 16 Oct 2017 12:16:05 -0700
Subject: call setFriendlyName() after tap adapter is initialized

---
 osdep/WindowsEthernetTap.cpp | 3 +++
 osdep/WindowsEthernetTap.hpp | 2 ++
 2 files changed, 5 insertions(+)

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;
 
-- 
cgit v1.2.3