From 6e771607c0f10c9e23716df9f81d26b66f3db8c4 Mon Sep 17 00:00:00 2001
From: Adam Ierymenko <adam.ierymenko@gmail.com>
Date: Mon, 19 Aug 2019 20:35:16 -0700
Subject: [PATCH] cleanup

---
 osdep/OSUtils.hpp      | 22 ++++++++++++++++++++++
 service/OneService.cpp | 25 ++-----------------------
 2 files changed, 24 insertions(+), 23 deletions(-)

diff --git a/osdep/OSUtils.hpp b/osdep/OSUtils.hpp
index 570f4144d..98546c088 100644
--- a/osdep/OSUtils.hpp
+++ b/osdep/OSUtils.hpp
@@ -264,6 +264,28 @@ public:
 	 */
 	static std::vector<std::string> split(const char *s,const char *const sep,const char *esc,const char *quot);
 
+	/**
+	 * Trim whitespace from beginning and end of string
+	 */
+	static inline std::string trimString(const std::string &s)
+	{
+		unsigned long end = (unsigned long)s.length();
+		while (end) {
+			char c = s[end - 1];
+			if ((c == ' ')||(c == '\r')||(c == '\n')||(!c)||(c == '\t'))
+				--end;
+			else break;
+		}
+		unsigned long start = 0;
+		while (start < end) {
+			char c = s[start];
+			if ((c == ' ')||(c == '\r')||(c == '\n')||(!c)||(c == '\t'))
+				++start;
+			else break;
+		}
+		return s.substr(start,end - start);
+	}
+
 	/**
 	 * Write a block of data to disk, replacing any current file contents
 	 *
diff --git a/service/OneService.cpp b/service/OneService.cpp
index e3e4beb73..53f643742 100644
--- a/service/OneService.cpp
+++ b/service/OneService.cpp
@@ -117,27 +117,6 @@ namespace ZeroTier {
 
 namespace {
 
-static const InetAddress NULL_INET_ADDR;
-
-static std::string _trimString(const std::string &s)
-{
-	unsigned long end = (unsigned long)s.length();
-	while (end) {
-		char c = s[end - 1];
-		if ((c == ' ')||(c == '\r')||(c == '\n')||(!c)||(c == '\t'))
-			--end;
-		else break;
-	}
-	unsigned long start = 0;
-	while (start < end) {
-		char c = s[start];
-		if ((c == ' ')||(c == '\r')||(c == '\n')||(!c)||(c == '\t'))
-			++start;
-		else break;
-	}
-	return s.substr(start,end - start);
-}
-
 static void _networkToJson(nlohmann::json &nj,const ZT_VirtualNetworkConfig *nc,const std::string &portDeviceName,const OneService::NetworkSettings &localSettings)
 {
 	char tmp[256];
@@ -511,7 +490,7 @@ public:
 						OSUtils::lockDownFile(authTokenPath.c_str(),false);
 					}
 				}
-				_authToken = _trimString(_authToken);
+				_authToken = OSUtils::trimString(_authToken);
 			}
 
 			{
@@ -1504,7 +1483,7 @@ public:
 					}
 				}
 				if (!src)
-					src = &NULL_INET_ADDR;
+					src = &InetAddress::NIL;
 
 				if ( (!checkIfManagedIsAllowed(n,*target)) || ((via->ss_family == target->ss_family)&&(matchIpOnly(myIps,*via))) )
 					continue;