Mirrors/i2pd
2
0
Fork 0
mirror of https://github.com/PurpleI2P/i2pd.git synced 2025-03-22 09:00:30 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

Update nat option: if nat=false, skip reachability testing

Browse source
This commit is contained in:
l-n-s 2016-10-28 15:57:18 -04:00
parent 578083df3e
commit 4f4748b8df
2 changed files with 5 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
Config.cpp
View file

@ -27,10 +27,6 @@ namespace config {
variables_map m_Options; variables_map m_Options;
void Init() { void Init() {
bool nat = true;
#ifdef MESHNET
nat = false;
#endif
options_description general("General options"); options_description general("General options");
general.add_options() general.add_options()
@ -45,7 +41,7 @@ namespace config {
("datadir", value<std::string>()->default_value(""), "Path to storage of i2pd data (RI, keys, peer profiles, ...)") ("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") ("host", value<std::string>()->default_value("0.0.0.0"), "External IP")
("ifname", value<std::string>()->default_value(""), "network interface to bind to") ("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?") ("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)") ("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") ("ipv4", value<bool>()->zero_tokens()->default_value(true), "Enable communication through ipv4")
("ipv6", value<bool>()->zero_tokens()->default_value(false), "Enable communication through ipv6") ("ipv6", value<bool>()->zero_tokens()->default_value(false), "Enable communication through ipv6")
@ -153,9 +149,6 @@ namespace config {
reseed.add_options() reseed.add_options()
("reseed.verify", value<bool>()->default_value(false), "Verify .su3 signature") ("reseed.verify", value<bool>()->default_value(false), "Verify .su3 signature")
("reseed.file", value<std::string>()->default_value(""), "Path to .su3 file") ("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( ("reseed.urls", value<std::string>()->default_value(
"https://reseed.i2p-projekt.de/," "https://reseed.i2p-projekt.de/,"
"https://i2p.mooo.com/netDb/," "https://i2p.mooo.com/netDb/,"
@ -169,7 +162,6 @@ namespace config {
"https://reseed-ru.lngserv.ru/," "https://reseed-ru.lngserv.ru/,"
"https://reseed.atomike.ninja/" "https://reseed.atomike.ninja/"
), "Reseed URLs, separated by comma") ), "Reseed URLs, separated by comma")
#endif
; ;
options_description addressbook("AddressBook options"); options_description addressbook("AddressBook options");

5
Transports.cpp
View file

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