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

Minor corrections to API return types

Browse Source
This commit is contained in:
Joseph Henry
2017-11-29 17:36:30 -08:00
parent 9e14d0361c
commit 2a2981a78e
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/ZT1Service.cpp
View File

@@ -30,6 +30,7 @@
* ZeroTier One service control wrapper * ZeroTier One service control wrapper
*/ */
#include "libzt.h"
#include "ZT1Service.h" #include "ZT1Service.h"
#include "libztDebug.h" #include "libztDebug.h"
#include "SysUtils.h" #include "SysUtils.h"
@@ -385,12 +386,12 @@ int zts_leave(const uint64_t nwid)
return 0; return 0;
} }
bool zts_core_running() int zts_core_running()
{ {
return zt1Service == NULL ? false : zt1Service->isRunning(); return zt1Service == NULL ? false : zt1Service->isRunning();
} }
bool zts_stack_running() int zts_stack_running()
{ {
_vtaps_lock.lock(); _vtaps_lock.lock();
// TODO: Perhaps a more robust way to check for this // TODO: Perhaps a more robust way to check for this
@@ -399,7 +400,7 @@ bool zts_stack_running()
return running; return running;
} }
bool zts_ready() int zts_ready()
{ {
return zts_core_running() && zts_stack_running(); return zts_core_running() && zts_stack_running();
} }
@@ -426,6 +427,7 @@ int zts_start(const char *path, bool blocking = false)
while (zt1Service->getNode()->address() <= 0) { while (zt1Service->getNode()->address() <= 0) {
api_sleep(ZTO_WRAPPER_CHECK_INTERVAL); api_sleep(ZTO_WRAPPER_CHECK_INTERVAL);
} }
DEBUG_INFO("node=%llx", zts_get_node_id());
while (status.online <= 0) { while (status.online <= 0) {
api_sleep(ZTO_WRAPPER_CHECK_INTERVAL); api_sleep(ZTO_WRAPPER_CHECK_INTERVAL);
zt1Service->getNode()->status(&status); zt1Service->getNode()->status(&status);