From ea1859541c29bc3cafcde5ad9be131c942522c5f Mon Sep 17 00:00:00 2001 From: Adam Ierymenko Date: Wed, 15 Apr 2015 18:32:25 -0700 Subject: More cleanup, and fix for the extremely unlikely case of identity collision. --- service/OneService.cpp | 16 ---------------- service/OneService.hpp | 4 ++-- 2 files changed, 2 insertions(+), 18 deletions(-) (limited to 'service') diff --git a/service/OneService.cpp b/service/OneService.cpp index 22938c66..38f6e116 100644 --- a/service/OneService.cpp +++ b/service/OneService.cpp @@ -143,22 +143,6 @@ public: struct sockaddr_in in4; struct sockaddr_in6 in6; - if (*hp) { - std::vector hpsp(Utils::split(hp,ZT_PATH_SEPARATOR_S,"","")); - std::string ptmp; - if (*hp == '/') - ptmp.push_back('/'); - for(std::vector::iterator pi(hpsp.begin());pi!=hpsp.end();++pi) { - if (ptmp.length() > 0) - ptmp.push_back(ZT_PATH_SEPARATOR); - ptmp.append(*pi); - if ((*pi != ".")&&(*pi != "..")) { - if (!OSUtils::mkdir(ptmp)) - throw std::runtime_error("home path does not exist, and could not create"); - } - } - } - ::memset((void *)&in4,0,sizeof(in4)); in4.sin_family = AF_INET; in4.sin_port = Utils::hton((uint16_t)port); diff --git a/service/OneService.hpp b/service/OneService.hpp index bba3b9b8..9df65179 100644 --- a/service/OneService.hpp +++ b/service/OneService.hpp @@ -32,7 +32,7 @@ namespace ZeroTier { -class NetworkConfigMaster; +class NetworkController; /** * Local service for ZeroTier One as system VPN/NFV provider @@ -85,7 +85,7 @@ public: static OneService *newInstance( const char *hp, unsigned int port, - NetworkConfigMaster *master = (NetworkConfigMaster *)0, + NetworkController *master = (NetworkController *)0, const char *overrideRootTopology = (const char *)0); virtual ~OneService(); -- cgit v1.2.3