Put selftest back and turn off tracing in PortMapper.

This commit is contained in:
Adam Ierymenko 2015-11-30 16:07:02 -08:00
parent f260250580
commit c21882da9c
2 changed files with 5 additions and 3 deletions

View file

@ -28,7 +28,7 @@
#ifdef ZT_USE_MINIUPNPC #ifdef ZT_USE_MINIUPNPC
// Uncomment to dump debug messages // Uncomment to dump debug messages
#define ZT_PORTMAPPER_TRACE 1 //#define ZT_PORTMAPPER_TRACE 1
#include <stdio.h> #include <stdio.h>
#include <stdlib.h> #include <stdlib.h>

View file

@ -1096,7 +1096,7 @@ int main(int argc,char **argv)
srand((unsigned int)time(0)); srand((unsigned int)time(0));
/* ///*
r |= testSqliteNetworkController(); r |= testSqliteNetworkController();
r |= testOther(); r |= testOther();
r |= testCrypto(); r |= testCrypto();
@ -1106,17 +1106,19 @@ int main(int argc,char **argv)
r |= testPhy(); r |= testPhy();
r |= testResolver(); r |= testResolver();
//r |= testHttp(); //r |= testHttp();
*/ //*/
if (r) if (r)
std::cout << std::endl << "SOMETHING FAILED!" << std::endl; std::cout << std::endl << "SOMETHING FAILED!" << std::endl;
/*
#ifdef ZT_USE_MINIUPNPC #ifdef ZT_USE_MINIUPNPC
std::cout << std::endl; std::cout << std::endl;
std::cout << "[portmapper] Starting port mapper and waiting forever... use CTRL+C to exit. (enable ZT_PORTMAPPER_TRACE in PortMapper.cpp for output)" << std::endl; std::cout << "[portmapper] Starting port mapper and waiting forever... use CTRL+C to exit. (enable ZT_PORTMAPPER_TRACE in PortMapper.cpp for output)" << std::endl;
PortMapper mapper(12345,"ZeroTier/__selftest"); PortMapper mapper(12345,"ZeroTier/__selftest");
Thread::sleep(0xffffffff); Thread::sleep(0xffffffff);
#endif #endif
*/
return r; return r;
} }