From 105023bd87bf5fb010d179664d2fb2711a190414 Mon Sep 17 00:00:00 2001
From: Adam Ierymenko <adam.ierymenko@zerotier.com>
Date: Wed, 25 Sep 2019 12:43:14 -0700
Subject: [PATCH] Build fix

---
 go/pkg/zerotier/node.go | 1 +
 node/Path.hpp           | 6 ++----
 osdep/EthernetTap.hpp   | 2 ++
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/go/pkg/zerotier/node.go b/go/pkg/zerotier/node.go
index d8187d4f1..d204a6ad1 100644
--- a/go/pkg/zerotier/node.go
+++ b/go/pkg/zerotier/node.go
@@ -531,6 +531,7 @@ func (n *Node) AddStaticRoot(id *Identity, addrs []InetAddress) {
 		}
 	}
 	if len(saddrs) > 0 {
+		n.log.Printf("adding or updating static root %s at address(es) %s", id.String(), straddrs)
 		ids := C.CString(id.String())
 		C.ZT_Node_setStaticRoot(unsafe.Pointer(n.zn), ids, &saddrs[0], C.uint(len(saddrs)))
 		C.free(unsafe.Pointer(ids))
diff --git a/node/Path.hpp b/node/Path.hpp
index c31360608..0ccffe386 100644
--- a/node/Path.hpp
+++ b/node/Path.hpp
@@ -29,8 +29,6 @@
 #include "RingBuffer.hpp"
 #include "Packet.hpp"
 
-#include "../osdep/Phy.hpp"
-
 /**
  * Maximum return value of preferenceRank()
  */
@@ -46,7 +44,6 @@ class RuntimeEnvironment;
 class Path
 {
 	friend class SharedPtr<Path>;
-	Phy<Path *> *_phy;
 
 public:
 	/**
@@ -144,7 +141,8 @@ public:
 		memset(_ifname, 0, 16);
 		memset(_addrString, 0, sizeof(_addrString));
 		if (_localSocket != -1) {
-			_phy->getIfName((PhySocket *) ((uintptr_t) _localSocket), _ifname, 16);
+			// TODO: add localInterface alongside localSocket
+			//_phy->getIfName((PhySocket *) ((uintptr_t) _localSocket), _ifname, 16);
 		}
 	}
 
diff --git a/osdep/EthernetTap.hpp b/osdep/EthernetTap.hpp
index 85c600043..43553f95c 100644
--- a/osdep/EthernetTap.hpp
+++ b/osdep/EthernetTap.hpp
@@ -64,12 +64,14 @@ public:
 		const char *const dnp = (dn.length() > 0) ? dn.c_str() : (const char *)0;
 		std::lock_guard<std::mutex> l(_managedRoutes_l);
 		_managedRoutes[std::pair<InetAddress,unsigned int>(target,metric)] = std::shared_ptr<ManagedRoute>(new ManagedRoute(target,via,dnp));
+		return 0;
 	}
 
 	ZT_ALWAYS_INLINE int removeRoute(const InetAddress &target,const InetAddress &via,const unsigned int metric)
 	{
 		std::lock_guard<std::mutex> l(_managedRoutes_l);
 		_managedRoutes.erase(std::pair<InetAddress,unsigned int>(target,metric));
+		return 0;
 	}
 
 	ZT_ALWAYS_INLINE int syncRoutes()