diff options
| author | Adam Ierymenko <adam.ierymenko@gmail.com> | 2015-11-30 15:17:31 -0800 |
|---|---|---|
| committer | Adam Ierymenko <adam.ierymenko@gmail.com> | 2015-11-30 15:17:31 -0800 |
| commit | 7e28161638a3c64754f55fe84d88917741b49019 (patch) | |
| tree | d6debc90b571e0d32e4d8f30a0803a47b0762eaa /selftest.cpp | |
| parent | ef4472e1857b86b5a45493a3c3566c7761260dad (diff) | |
| parent | 40a4ba6e39bbc59b320eef2f6839cf30c3f7c8b1 (diff) | |
| download | infinitytier-7e28161638a3c64754f55fe84d88917741b49019.tar.gz infinitytier-7e28161638a3c64754f55fe84d88917741b49019.zip | |
Merge dev
Diffstat (limited to 'selftest.cpp')
| -rw-r--r-- | selftest.cpp | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/selftest.cpp b/selftest.cpp index 87043ddd..e68f564c 100644 --- a/selftest.cpp +++ b/selftest.cpp @@ -58,6 +58,8 @@ #include "osdep/Phy.hpp" #include "osdep/Http.hpp" #include "osdep/BackgroundResolver.hpp" +#include "osdep/PortMapper.hpp" +#include "osdep/Thread.hpp" #ifdef ZT_ENABLE_NETWORK_CONTROLLER #include "controller/SqliteNetworkController.hpp" @@ -1094,6 +1096,7 @@ int main(int argc,char **argv) srand((unsigned int)time(0)); + /* r |= testSqliteNetworkController(); r |= testOther(); r |= testCrypto(); @@ -1103,9 +1106,17 @@ 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; } |