diff options
| author | Adam Ierymenko <adam.ierymenko@gmail.com> | 2015-04-15 18:32:25 -0700 |
|---|---|---|
| committer | Adam Ierymenko <adam.ierymenko@gmail.com> | 2015-04-15 18:32:25 -0700 |
| commit | ea1859541c29bc3cafcde5ad9be131c942522c5f (patch) | |
| tree | cc6aaa37552466d78a957f63bb22f71e07dbc3dd /service | |
| parent | f7b1437154576ec42734de6c2b2ee4adfb1f4f6d (diff) | |
| download | infinitytier-ea1859541c29bc3cafcde5ad9be131c942522c5f.tar.gz infinitytier-ea1859541c29bc3cafcde5ad9be131c942522c5f.zip | |
More cleanup, and fix for the extremely unlikely case of identity collision.
Diffstat (limited to 'service')
| -rw-r--r-- | service/OneService.cpp | 16 | ||||
| -rw-r--r-- | service/OneService.hpp | 4 |
2 files changed, 2 insertions, 18 deletions
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<std::string> hpsp(Utils::split(hp,ZT_PATH_SEPARATOR_S,"","")); - std::string ptmp; - if (*hp == '/') - ptmp.push_back('/'); - for(std::vector<std::string>::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(); |