dark/zerotiertspu
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Bug fix in zerotier-cli (Unix)

Browse source
This commit is contained in:
Adam Ierymenko 2014-10-07 16:16:22 -07:00
parent b13845e528
commit b809dad94a
2 changed files with 13 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

11
main.cpp
View file

@ -119,8 +119,10 @@ static void _CBresultHandler(void *arg,const char *line)
if (line) {
if ((line[0] == '.')&&(line[1] == (char)0)) {
fflush(stdout);
*((bool *)arg) = true;
} else fprintf(stdout,"%s"ZT_EOL_S,line);
::exit(0); // terminate CLI on end of message
} else {
fprintf(stdout,"%s"ZT_EOL_S,line);
}
}
}
@ -180,15 +182,14 @@ static int main(const char *homeDir,int argc,char **argv)
return 1;
}
volatile bool done = false;
NodeControlClient client((std::string(ZT_IPC_ENDPOINT_BASE) + id.address().toString()).c_str(),authToken.c_str(),&_CBresultHandler,(void *)&done);
NodeControlClient client((std::string(ZT_IPC_ENDPOINT_BASE) + id.address().toString()).c_str(),authToken.c_str(),&_CBresultHandler,(void *)0);
const char *err = client.error();
if (err) {
fprintf(stderr,"%s: fatal error: unable to connect (is ZeroTier One running?) (%s)"ZT_EOL_S,argv[0],err);
return 1;
}
client.send(query.c_str());
while (!done) Thread::sleep(100); // dis be ghetto
for(;;) { Thread::sleep(60000); } // exit() is called at end of message from handler
} catch (std::exception &exc) {
fprintf(stderr,"%s: fatal error: unable to connect (is ZeroTier One running?) (%s)"ZT_EOL_S,argv[0],exc.what());
return 1;