Browse Source

don't set proxy if ntcp2 is disabled

pull/1641/head
orignal 4 years ago
parent
commit
744b25190a
  1. 2
      daemon/Daemon.cpp
  2. 4
      libi2pd/Transports.cpp

2
daemon/Daemon.cpp

@ -367,7 +367,7 @@ namespace util
if(!ntcp2) LogPrint(eLogInfo, "Daemon: ntcp2 disabled"); if(!ntcp2) LogPrint(eLogInfo, "Daemon: ntcp2 disabled");
i2p::transport::transports.SetCheckReserved(checkInReserved); i2p::transport::transports.SetCheckReserved(checkInReserved);
i2p::transport::transports.Start(ntcp2 || i2p::context.SupportsMesh (), ssu); i2p::transport::transports.Start(ntcp2, ssu);
if (i2p::transport::transports.IsBoundSSU() || i2p::transport::transports.IsBoundNTCP2()) if (i2p::transport::transports.IsBoundSSU() || i2p::transport::transports.IsBoundNTCP2())
LogPrint(eLogInfo, "Daemon: Transports started"); LogPrint(eLogInfo, "Daemon: Transports started");
else else

4
libi2pd/Transports.cpp

@ -174,9 +174,9 @@ namespace transport
std::string ntcp2proxy; i2p::config::GetOption("ntcp2.proxy", ntcp2proxy); std::string ntcp2proxy; i2p::config::GetOption("ntcp2.proxy", ntcp2proxy);
i2p::http::URL proxyurl; i2p::http::URL proxyurl;
// create NTCP2. TODO: move to acceptor // create NTCP2. TODO: move to acceptor
if (enableNTCP2) if (enableNTCP2 || i2p::context.SupportsMesh ())
{ {
if(!ntcp2proxy.empty()) if(!ntcp2proxy.empty() && enableNTCP2)
{ {
if(proxyurl.parse(ntcp2proxy)) if(proxyurl.parse(ntcp2proxy))
{ {

Loading…
Cancel
Save