|
|
@ -58,14 +58,14 @@ namespace client |
|
|
|
uint16_t samPort; i2p::config::GetOption("sam.port", samPort); |
|
|
|
uint16_t samPort; i2p::config::GetOption("sam.port", samPort); |
|
|
|
bool singleThread; i2p::config::GetOption("sam.singlethread", singleThread); |
|
|
|
bool singleThread; i2p::config::GetOption("sam.singlethread", singleThread); |
|
|
|
LogPrint(eLogInfo, "Clients: starting SAM bridge at ", samAddr, ":", samPort); |
|
|
|
LogPrint(eLogInfo, "Clients: starting SAM bridge at ", samAddr, ":", samPort); |
|
|
|
try |
|
|
|
try { |
|
|
|
{ |
|
|
|
|
|
|
|
m_SamBridge = new SAMBridge (samAddr, samPort, singleThread); |
|
|
|
m_SamBridge = new SAMBridge (samAddr, samPort, singleThread); |
|
|
|
m_SamBridge->Start (); |
|
|
|
m_SamBridge->Start (); |
|
|
|
} |
|
|
|
} catch (std::exception& e) { |
|
|
|
catch (std::exception& e) |
|
|
|
|
|
|
|
{ |
|
|
|
|
|
|
|
LogPrint(eLogError, "Clients: Exception in SAM bridge: ", e.what()); |
|
|
|
LogPrint(eLogError, "Clients: Exception in SAM bridge: ", e.what()); |
|
|
|
|
|
|
|
#ifdef WIN32_APP |
|
|
|
|
|
|
|
ShowMessageBox (eLogError, "Unable to start SAM bridge at ", samAddr, ":", samPort, ": ", e.what ()); |
|
|
|
|
|
|
|
#endif |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
@ -80,6 +80,9 @@ namespace client |
|
|
|
m_BOBCommandChannel->Start (); |
|
|
|
m_BOBCommandChannel->Start (); |
|
|
|
} catch (std::exception& e) { |
|
|
|
} catch (std::exception& e) { |
|
|
|
LogPrint(eLogError, "Clients: Exception in BOB bridge: ", e.what()); |
|
|
|
LogPrint(eLogError, "Clients: Exception in BOB bridge: ", e.what()); |
|
|
|
|
|
|
|
#ifdef WIN32_APP |
|
|
|
|
|
|
|
ShowMessageBox (eLogError, "Unable to start BOB bridge at ", bobAddr, ":", bobPort, ": ", e.what ()); |
|
|
|
|
|
|
|
#endif |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
@ -90,14 +93,14 @@ namespace client |
|
|
|
std::string i2cpAddr; i2p::config::GetOption("i2cp.address", i2cpAddr); |
|
|
|
std::string i2cpAddr; i2p::config::GetOption("i2cp.address", i2cpAddr); |
|
|
|
uint16_t i2cpPort; i2p::config::GetOption("i2cp.port", i2cpPort); |
|
|
|
uint16_t i2cpPort; i2p::config::GetOption("i2cp.port", i2cpPort); |
|
|
|
LogPrint(eLogInfo, "Clients: starting I2CP at ", i2cpAddr, ":", i2cpPort); |
|
|
|
LogPrint(eLogInfo, "Clients: starting I2CP at ", i2cpAddr, ":", i2cpPort); |
|
|
|
try |
|
|
|
try { |
|
|
|
{ |
|
|
|
|
|
|
|
m_I2CPServer = new I2CPServer (i2cpAddr, i2cpPort); |
|
|
|
m_I2CPServer = new I2CPServer (i2cpAddr, i2cpPort); |
|
|
|
m_I2CPServer->Start (); |
|
|
|
m_I2CPServer->Start (); |
|
|
|
} |
|
|
|
} catch (std::exception& e) { |
|
|
|
catch (std::exception& e) |
|
|
|
|
|
|
|
{ |
|
|
|
|
|
|
|
LogPrint(eLogError, "Clients: Exception in I2CP: ", e.what()); |
|
|
|
LogPrint(eLogError, "Clients: Exception in I2CP: ", e.what()); |
|
|
|
|
|
|
|
#ifdef WIN32_APP |
|
|
|
|
|
|
|
ShowMessageBox (eLogError, "Unable to start I2CP at ", i2cpAddr, ":", i2cpPort, ": ", e.what ()); |
|
|
|
|
|
|
|
#endif |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
@ -501,16 +504,12 @@ namespace client |
|
|
|
LogPrint (eLogInfo, "Clients: ", numServerTunnels, " I2P server tunnels created"); |
|
|
|
LogPrint (eLogInfo, "Clients: ", numServerTunnels, " I2P server tunnels created"); |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
void ClientContext::ReadTunnels (const std::string& tunConf, int& numClientTunnels, int& numServerTunnels) |
|
|
|
void ClientContext::ReadTunnels (const std::string& tunConf, int& numClientTunnels, int& numServerTunnels) |
|
|
|
{ |
|
|
|
{ |
|
|
|
boost::property_tree::ptree pt; |
|
|
|
boost::property_tree::ptree pt; |
|
|
|
try |
|
|
|
try { |
|
|
|
{ |
|
|
|
|
|
|
|
boost::property_tree::read_ini (tunConf, pt); |
|
|
|
boost::property_tree::read_ini (tunConf, pt); |
|
|
|
} |
|
|
|
} catch (std::exception& ex) { |
|
|
|
catch (std::exception& ex) |
|
|
|
|
|
|
|
{ |
|
|
|
|
|
|
|
LogPrint (eLogWarning, "Clients: Can't read ", tunConf, ": ", ex.what ()); |
|
|
|
LogPrint (eLogWarning, "Clients: Can't read ", tunConf, ": ", ex.what ()); |
|
|
|
return; |
|
|
|
return; |
|
|
|
} |
|
|
|
} |
|
|
@ -565,14 +564,11 @@ namespace client |
|
|
|
// TODO: hostnames
|
|
|
|
// TODO: hostnames
|
|
|
|
boost::asio::ip::udp::endpoint end(boost::asio::ip::address::from_string(address), port); |
|
|
|
boost::asio::ip::udp::endpoint end(boost::asio::ip::address::from_string(address), port); |
|
|
|
if (!localDestination) |
|
|
|
if (!localDestination) |
|
|
|
{ |
|
|
|
|
|
|
|
localDestination = m_SharedLocalDestination; |
|
|
|
localDestination = m_SharedLocalDestination; |
|
|
|
} |
|
|
|
|
|
|
|
auto clientTunnel = std::make_shared<I2PUDPClientTunnel>(name, dest, end, localDestination, destinationPort); |
|
|
|
auto clientTunnel = std::make_shared<I2PUDPClientTunnel>(name, dest, end, localDestination, destinationPort); |
|
|
|
if(m_ClientForwards.insert(std::make_pair(end, clientTunnel)).second) |
|
|
|
if(m_ClientForwards.insert(std::make_pair(end, clientTunnel)).second) |
|
|
|
{ |
|
|
|
|
|
|
|
clientTunnel->Start(); |
|
|
|
clientTunnel->Start(); |
|
|
|
} |
|
|
|
|
|
|
|
else |
|
|
|
else |
|
|
|
LogPrint(eLogError, "Clients: I2P Client forward for endpoint ", end, " already exists"); |
|
|
|
LogPrint(eLogError, "Clients: I2P Client forward for endpoint ", end, " already exists"); |
|
|
|
|
|
|
|
|
|
|
@ -598,7 +594,10 @@ namespace client |
|
|
|
} |
|
|
|
} |
|
|
|
else if (type == I2P_TUNNELS_SECTION_TYPE_WEBSOCKS) |
|
|
|
else if (type == I2P_TUNNELS_SECTION_TYPE_WEBSOCKS) |
|
|
|
{ |
|
|
|
{ |
|
|
|
LogPrint(eLogError, "Clients: I2P Client tunnel websocks is deprecated"); |
|
|
|
LogPrint(eLogWarning, "Clients: I2P Client tunnel websocks is deprecated, not starting ", name, " tunnel"); |
|
|
|
|
|
|
|
#ifdef WIN32_APP |
|
|
|
|
|
|
|
ShowMessageBox (eLogWarning, "Skipped websocks tunnel ", name, " because it's support is discontinued."); |
|
|
|
|
|
|
|
#endif |
|
|
|
continue; |
|
|
|
continue; |
|
|
|
} |
|
|
|
} |
|
|
|
else |
|
|
|
else |
|
|
@ -608,6 +607,7 @@ namespace client |
|
|
|
clientTunnel = tun; |
|
|
|
clientTunnel = tun; |
|
|
|
clientEndpoint = tun->GetLocalEndpoint (); |
|
|
|
clientEndpoint = tun->GetLocalEndpoint (); |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
uint32_t timeout = section.second.get<uint32_t>(I2P_CLIENT_TUNNEL_CONNECT_TIMEOUT, 0); |
|
|
|
uint32_t timeout = section.second.get<uint32_t>(I2P_CLIENT_TUNNEL_CONNECT_TIMEOUT, 0); |
|
|
|
if(timeout) |
|
|
|
if(timeout) |
|
|
|
{ |
|
|
|
{ |
|
|
@ -745,12 +745,14 @@ namespace client |
|
|
|
|
|
|
|
|
|
|
|
} |
|
|
|
} |
|
|
|
else |
|
|
|
else |
|
|
|
LogPrint (eLogWarning, "Clients: Unknown section type=", type, " of ", name, " in ", tunConf); |
|
|
|
LogPrint (eLogWarning, "Clients: Unknown section type = ", type, " of ", name, " in ", tunConf); |
|
|
|
|
|
|
|
|
|
|
|
} |
|
|
|
} |
|
|
|
catch (std::exception& ex) |
|
|
|
catch (std::exception& ex) |
|
|
|
{ |
|
|
|
{ |
|
|
|
LogPrint (eLogError, "Clients: Can't read tunnel ", name, " params: ", ex.what ()); |
|
|
|
LogPrint (eLogError, "Clients: Can't read tunnel ", name, " params: ", ex.what ()); |
|
|
|
|
|
|
|
#ifdef WIN32_APP |
|
|
|
|
|
|
|
ShowMessageBox (eLogError, "Unable to start tunnel ", name, ": ", ex.what ()); |
|
|
|
|
|
|
|
#endif |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
@ -781,14 +783,14 @@ namespace client |
|
|
|
else |
|
|
|
else |
|
|
|
LogPrint(eLogError, "Clients: failed to load HTTP Proxy key"); |
|
|
|
LogPrint(eLogError, "Clients: failed to load HTTP Proxy key"); |
|
|
|
} |
|
|
|
} |
|
|
|
try |
|
|
|
try { |
|
|
|
{ |
|
|
|
|
|
|
|
m_HttpProxy = new i2p::proxy::HTTPProxy("HTTP Proxy", httpProxyAddr, httpProxyPort, httpOutProxyURL, httpAddresshelper, localDestination); |
|
|
|
m_HttpProxy = new i2p::proxy::HTTPProxy("HTTP Proxy", httpProxyAddr, httpProxyPort, httpOutProxyURL, httpAddresshelper, localDestination); |
|
|
|
m_HttpProxy->Start(); |
|
|
|
m_HttpProxy->Start(); |
|
|
|
} |
|
|
|
} catch (std::exception& e) { |
|
|
|
catch (std::exception& e) |
|
|
|
|
|
|
|
{ |
|
|
|
|
|
|
|
LogPrint(eLogError, "Clients: Exception in HTTP Proxy: ", e.what()); |
|
|
|
LogPrint(eLogError, "Clients: Exception in HTTP Proxy: ", e.what()); |
|
|
|
|
|
|
|
#ifdef WIN32_APP |
|
|
|
|
|
|
|
ShowMessageBox (eLogError, "Unable to start HTTP Proxy at ", httpProxyAddr, ":", httpProxyPort, ": ", e.what ()); |
|
|
|
|
|
|
|
#endif |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
@ -820,15 +822,15 @@ namespace client |
|
|
|
else |
|
|
|
else |
|
|
|
LogPrint(eLogError, "Clients: failed to load SOCKS Proxy key"); |
|
|
|
LogPrint(eLogError, "Clients: failed to load SOCKS Proxy key"); |
|
|
|
} |
|
|
|
} |
|
|
|
try |
|
|
|
try { |
|
|
|
{ |
|
|
|
|
|
|
|
m_SocksProxy = new i2p::proxy::SOCKSProxy("SOCKS", socksProxyAddr, socksProxyPort, |
|
|
|
m_SocksProxy = new i2p::proxy::SOCKSProxy("SOCKS", socksProxyAddr, socksProxyPort, |
|
|
|
socksOutProxy, socksOutProxyAddr, socksOutProxyPort, localDestination); |
|
|
|
socksOutProxy, socksOutProxyAddr, socksOutProxyPort, localDestination); |
|
|
|
m_SocksProxy->Start(); |
|
|
|
m_SocksProxy->Start(); |
|
|
|
} |
|
|
|
} catch (std::exception& e) { |
|
|
|
catch (std::exception& e) |
|
|
|
|
|
|
|
{ |
|
|
|
|
|
|
|
LogPrint(eLogError, "Clients: Exception in SOCKS Proxy: ", e.what()); |
|
|
|
LogPrint(eLogError, "Clients: Exception in SOCKS Proxy: ", e.what()); |
|
|
|
|
|
|
|
#ifdef WIN32_APP |
|
|
|
|
|
|
|
ShowMessageBox (eLogError, "Unable to start SOCKS Proxy at ", socksProxyAddr, ":", socksProxyPort, ": ", e.what ()); |
|
|
|
|
|
|
|
#endif |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|