From 3d85a615fb9a50e193eac5320522be409408a3c3 Mon Sep 17 00:00:00 2001 From: Adam Ierymenko Date: Tue, 28 Oct 2014 14:17:39 -0700 Subject: NULL dereference on still-initializing node bug fix in status query commands, and doc updates. --- testnet.cpp | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) (limited to 'testnet.cpp') diff --git a/testnet.cpp b/testnet.cpp index 605d8945..b6f6572b 100644 --- a/testnet.cpp +++ b/testnet.cpp @@ -278,12 +278,14 @@ static void doList(const std::vector &cmd) ZT1_Node_Status status; for(std::map< Address,SimNode * >::iterator n(nodes.begin());n!=nodes.end();++n) { n->second->node.status(&status); - printf("%s %c %s (%u peers, %u direct links)"ZT_EOL_S, - n->first.toString().c_str(), - n->second->supernode ? 'S' : 'N', - (status.online ? "ONLINE" : "OFFLINE"), - status.knownPeers, - status.directlyConnectedPeers); + if (status.initialized) { + printf("%s %c %s (%u peers, %u direct links)"ZT_EOL_S, + n->first.toString().c_str(), + n->second->supernode ? 'S' : 'N', + (status.online ? "ONLINE" : "OFFLINE"), + status.knownPeers, + status.directlyConnectedPeers); + } else printf("%s ? INITIALIZING (0 peers, 0 direct links)"ZT_EOL_S,n->first.toString().c_str()); } } @@ -571,6 +573,8 @@ static void doUnicast(const std::vector &cmd) } } } + + printf("---------- sent %u, received %u"ZT_EOL_S,(unsigned int)sentPairs.size(),(unsigned int)receivedPairs.size()); } int main(int argc,char **argv) -- cgit v1.2.3