From 2fc3d12fb66d94387d537c4d2c4c1e7a7ca4beeb Mon Sep 17 00:00:00 2001
From: Adam Ierymenko <adam.ierymenko@gmail.com>
Date: Thu, 29 Sep 2016 14:48:39 -0700
Subject: Minor tweaks to member code in controller, and fix Linux build.

---
 controller/EmbeddedNetworkController.cpp | 7 +------
 controller/EmbeddedNetworkController.hpp | 4 ++++
 osdep/ManagedRoute.cpp                   | 4 ++--
 3 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/controller/EmbeddedNetworkController.cpp b/controller/EmbeddedNetworkController.cpp
index cd8ce8bf..a93aa027 100644
--- a/controller/EmbeddedNetworkController.cpp
+++ b/controller/EmbeddedNetworkController.cpp
@@ -1004,12 +1004,7 @@ unsigned int EmbeddedNetworkController::handleControlPlaneHttpGET(
 						if (!member.size())
 							return 404;
 
-						char addrs[24];
-						Utils::snprintf(addrs,sizeof(addrs),"%.10llx",address);
-
-						// Add non-persisted fields
-						member["clock"] = OSUtils::now();
-
+						_addMemberNonPersistedFields(member,now);
 						responseBody = member.dump(2);
 						responseContentType = "application/json";
 
diff --git a/controller/EmbeddedNetworkController.hpp b/controller/EmbeddedNetworkController.hpp
index 1bfd9577..78d65c3a 100644
--- a/controller/EmbeddedNetworkController.hpp
+++ b/controller/EmbeddedNetworkController.hpp
@@ -181,6 +181,10 @@ private:
 		network["activeMemberCount"] = nmi.activeMemberCount;
 		network["totalMemberCount"] = nmi.totalMemberCount;
 	}
+	inline void _addMemberNonPersistedFields(nlohmann::json &member,uint64_t now)
+	{
+		member["clock"] = now;
+	}
 
 	// These are const after construction
 	Node *const _node;
diff --git a/osdep/ManagedRoute.cpp b/osdep/ManagedRoute.cpp
index 127f1b7d..1fc6c78e 100644
--- a/osdep/ManagedRoute.cpp
+++ b/osdep/ManagedRoute.cpp
@@ -524,11 +524,11 @@ void ManagedRoute::remove()
 #endif // __BSD__ ------------------------------------------------------------
 
 #ifdef __LINUX__ // ----------------------------------------------------------
-		_routeCmd("del",*r,_via,(_via) ? (const char *)0 : _device);
+		_routeCmd("del",r->first,_via,(_via) ? (const char *)0 : _device);
 #endif // __LINUX__ ----------------------------------------------------------
 
 #ifdef __WINDOWS__ // --------------------------------------------------------
-		_winRoute(true,interfaceLuid,interfaceIndex,*r,_via);
+		_winRoute(true,interfaceLuid,interfaceIndex,r->first,_via);
 #endif // __WINDOWS__ --------------------------------------------------------
 	}
 
-- 
cgit v1.2.3