mirror of
https://github.com/ZeroTier/ZeroTierOne
synced 2025-07-06 04:51:46 -07:00
(1) Make ZT_ naming convention consistent (get rid of ZT1_), (2) Make local interface a full sockaddr_storage instead of an int identifier, which turns out to be better for multi-homing and other uses.
This commit is contained in:
parent
0e5aac6a11
commit
f69454ec98
29 changed files with 622 additions and 622 deletions
6
one.cpp
6
one.cpp
|
@ -73,7 +73,7 @@
|
|||
|
||||
#include "service/OneService.hpp"
|
||||
|
||||
#define ZT1_PID_PATH "zerotier-one.pid"
|
||||
#define ZT_PID_PATH "zerotier-one.pid"
|
||||
|
||||
using namespace ZeroTier;
|
||||
|
||||
|
@ -976,7 +976,7 @@ int main(int argc,char **argv)
|
|||
|
||||
std::string overrideRootTopology;
|
||||
std::string homeDir;
|
||||
unsigned int port = ZT1_DEFAULT_PORT;
|
||||
unsigned int port = ZT_DEFAULT_PORT;
|
||||
bool skipRootCheck = false;
|
||||
|
||||
for(int i=1;i<argc;++i) {
|
||||
|
@ -1154,7 +1154,7 @@ int main(int argc,char **argv)
|
|||
#endif // __WINDOWS__
|
||||
|
||||
#ifdef __UNIX_LIKE__
|
||||
std::string pidPath(homeDir + ZT_PATH_SEPARATOR_S + ZT1_PID_PATH);
|
||||
std::string pidPath(homeDir + ZT_PATH_SEPARATOR_S + ZT_PID_PATH);
|
||||
{
|
||||
// Write .pid file to home folder
|
||||
FILE *pf = fopen(pidPath.c_str(),"w");
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue