Merge pull request #692 from l-n-s/my_fixes

My fixes

Config.cpp

@@ -27,10 +27,6 @@ namespace config {
   variables_map       m_Options;
 
   void Init() {
-    bool nat = true;
-#ifdef MESHNET
-    nat = false;
-#endif
 
     options_description general("General options");
     general.add_options()
@@ -44,8 +40,8 @@ namespace config {
 	  ("family",    value<std::string>()->default_value(""),     "Specify a family, router belongs to")
 	  ("datadir",   value<std::string>()->default_value(""),     "Path to storage of i2pd data (RI, keys, peer profiles, ...)")
       ("host",      value<std::string>()->default_value("0.0.0.0"),     "External IP")
-      ("ifname",    value<std::string>()->default_value(""), "network interface to bind to")
-      ("nat",       value<bool>()->zero_tokens()->default_value(nat), "should we assume we are behind NAT?")
+      ("ifname",    value<std::string>()->default_value(""), "Network interface to bind to")
+      ("nat",       value<bool>()->zero_tokens()->default_value(true), "Should we assume we are behind NAT?")
       ("port",      value<uint16_t>()->default_value(0),                "Port to listen for incoming connections (default: auto)")
       ("ipv4",      value<bool>()->zero_tokens()->default_value(true),  "Enable communication through ipv4")
       ("ipv6",      value<bool>()->zero_tokens()->default_value(false), "Enable communication through ipv6")
@@ -55,8 +51,8 @@ namespace config {
       ("notransit", value<bool>()->zero_tokens()->default_value(false), "Router will not accept transit tunnels at startup")
       ("floodfill", value<bool>()->zero_tokens()->default_value(false), "Router will be floodfill")
       ("bandwidth", value<std::string>()->default_value(""), "Bandwidth limit: integer in kbps or letters: L (32), O (256), P (2048), X (>9000)")
-      ("ntcp", value<bool>()->zero_tokens()->default_value(true), "enable ntcp transport")
-      ("ssu", value<bool>()->zero_tokens()->default_value(true), "enable ssu transport")
+      ("ntcp", value<bool>()->zero_tokens()->default_value(true), "Enable NTCP transport")
+      ("ssu", value<bool>()->zero_tokens()->default_value(true), "Enable SSU transport")
 #ifdef _WIN32
       ("svcctl",    value<std::string>()->default_value(""),     "Windows service management ('install' or 'remove')")
       ("insomnia", value<bool>()->zero_tokens()->default_value(false), "Prevent system from sleeping")
@@ -153,9 +149,6 @@ namespace config {
 	reseed.add_options()
 	  ("reseed.verify", value<bool>()->default_value(false), "Verify .su3 signature")	
 	  ("reseed.file", value<std::string>()->default_value(""),  "Path to .su3 file")
-#ifdef MESHNET
-	  ("reseed.urls", value<std::string>()->default_value("https://reseed.i2p.rocks:8443/"),  "Reseed URLs, separated by comma")
-#else
 	  ("reseed.urls", value<std::string>()->default_value(
 		"https://reseed.i2p-projekt.de/,"
 		"https://i2p.mooo.com/netDb/,"
@@ -169,7 +162,6 @@ namespace config {
 		"https://reseed-ru.lngserv.ru/,"
 	    "https://reseed.atomike.ninja/"                                                   
 		),  "Reseed URLs, separated by comma")
-#endif
 	  ;	
 
   	options_description addressbook("AddressBook options");
@@ -182,10 +174,10 @@ namespace config {
 
   	options_description trust("Trust options");
   	trust.add_options()
-      ("trust.enabled", value<bool>()->default_value(false), "enable explicit trust options")
+      ("trust.enabled", value<bool>()->default_value(false), "Enable explicit trust options")
       ("trust.family", value<std::string>()->default_value(""), "Router Familiy to trust for first hops")
 			("trust.routers", value<std::string>()->default_value(""), "Only Connect to these routers")
-      ("trust.hidden", value<bool>()->default_value(false), "should we hide our router from other routers?");
+      ("trust.hidden", value<bool>()->default_value(false), "Should we hide our router from other routers?");
 
     m_OptionsDesc
       .add(general)

Makefile.linux

@@ -39,7 +39,7 @@ ifeq ($(USE_STATIC),yes)
   LDLIBS += $(LIBDIR)/libssl.a
   LDLIBS += $(LIBDIR)/libcrypto.a
   LDLIBS += $(LIBDIR)/libz.a
-  LDLIBS += -lpthread -static-libstdc++ -static-libgcc -lrt
+  LDLIBS += -lpthread -static-libstdc++ -static-libgcc -lrt -ldl
   USE_AESNI := no
 else
   LDLIBS = -lcrypto -lssl -lz -lboost_system -lboost_date_time -lboost_filesystem -lboost_program_options -lpthread

Transports.cpp

@@ -4,6 +4,7 @@
 #include "I2NPProtocol.h"
 #include "NetDb.h"
 #include "Transports.h"
+#include "Config.h"
 
 using namespace i2p::data;
 
@@ -503,9 +504,9 @@ namespace transport
 		}
 		if (m_SSUServer)
 		{
-#ifndef MESHNET
+                        bool nat;  i2p::config::GetOption("nat", nat);
+                        if (nat)
                             i2p::context.SetStatus (eRouterStatusTesting);
-#endif
 
 			for (int i = 0; i < 5; i++)
 			{