gfwleak/zhangyang-libzt
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Updated convenience function zts_get_node_id_from_file()

Browse Source
This commit is contained in:
Joseph Henry
2017-11-15 15:28:55 -08:00
parent 4525b2c553
commit d3f92d98ed
2 changed files with 11 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
include/ZT1Service.h
View File

@@ -197,6 +197,14 @@ void zts_get_homepath(char *homePath, size_t len);
*/ */
uint64_t zts_get_node_id(); uint64_t zts_get_node_id();
/**
* @brief Returns the ztaddress/nodeId/device ID of this instance (as read from a file)
*
* @usage Call with or without starting the service with zts_start()
* @return
*/
uint64_t zts_get_node_id_from_file(const char *filepath);
/** /**
* @brief Return the number of peers * @brief Return the number of peers
* *

26
src/ZT1Service.cpp
View File

@@ -162,37 +162,17 @@ VirtualTap *getAnyTap()
return vtap; return vtap;
} }
/* uint64_t zts_get_node_id_from_file(const char *filepath)
else // Service isn't online, try to read ID from file
{
std::string fname("identity.public");
std::string fpath(homeDir);
if (ZeroTier::OSUtils::fileExists((fpath + ZT_PATH_SEPARATOR_S + fname).c_str(),false)) {
std::string oldid;
ZeroTier::OSUtils::readFile((fpath + ZT_PATH_SEPARATOR_S + fname).c_str(),oldid);
memcpy(devID, oldid.c_str(), ZTO_ID_LEN); // first 10 bytes of file
return 0;
}
}
*/
int zts_get_id_from_file(const char *filepath, uint64_t *nodeId)
{ {
/*
DEBUG_EXTRA(); DEBUG_EXTRA();
std::string fname("identity.public"); std::string fname("identity.public");
std::string fpath(filepath); std::string fpath(filepath);
if (ZeroTier::OSUtils::fileExists((fpath + ZT_PATH_SEPARATOR_S + fname).c_str(),false)) { if (ZeroTier::OSUtils::fileExists((fpath + ZT_PATH_SEPARATOR_S + fname).c_str(),false)) {
std::string oldid; std::string oldid;
ZeroTier::OSUtils::readFile((fpath + ZT_PATH_SEPARATOR_S + fname).c_str(),oldid); ZeroTier::OSUtils::readFile((fpath + ZT_PATH_SEPARATOR_S + fname).c_str(),oldid);
uint64_t value = Utils::hexStrToU64(oldid); return Utils::hexStrToU64(oldid);
memcpy(nodeId, value, sizeof(uint64_t)); // first 10 bytes of file
// TOmorrow
return 0;
} }
*/ return 0;
return -1;
} }
// Starts a ZeroTier service in the background // Starts a ZeroTier service in the background