From c21882da9ce3dca08dc3ca096482ff69b7355e13 Mon Sep 17 00:00:00 2001 From: Adam Ierymenko Date: Mon, 30 Nov 2015 16:07:02 -0800 Subject: [PATCH] Put selftest back and turn off tracing in PortMapper. --- osdep/PortMapper.cpp | 2 +- selftest.cpp | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/osdep/PortMapper.cpp b/osdep/PortMapper.cpp index 5c0179312..87c886c2a 100644 --- a/osdep/PortMapper.cpp +++ b/osdep/PortMapper.cpp @@ -28,7 +28,7 @@ #ifdef ZT_USE_MINIUPNPC // Uncomment to dump debug messages -#define ZT_PORTMAPPER_TRACE 1 +//#define ZT_PORTMAPPER_TRACE 1 #include #include diff --git a/selftest.cpp b/selftest.cpp index e68f564cf..4e9219b2e 100644 --- a/selftest.cpp +++ b/selftest.cpp @@ -1096,7 +1096,7 @@ int main(int argc,char **argv) srand((unsigned int)time(0)); - /* + ///* r |= testSqliteNetworkController(); r |= testOther(); r |= testCrypto(); @@ -1106,17 +1106,19 @@ int main(int argc,char **argv) r |= testPhy(); r |= testResolver(); //r |= testHttp(); - */ + //*/ if (r) std::cout << std::endl << "SOMETHING FAILED!" << std::endl; + /* #ifdef ZT_USE_MINIUPNPC 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; PortMapper mapper(12345,"ZeroTier/__selftest"); Thread::sleep(0xffffffff); #endif + */ return r; }