Ton of uPnP work and adding NAT-PMP support, still testing...

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;
 }