|
|
@ -421,7 +421,8 @@ namespace client |
|
|
|
{ I2CP_PARAM_INBOUND_TUNNELS_QUANTITY, "3" }, |
|
|
|
{ I2CP_PARAM_INBOUND_TUNNELS_QUANTITY, "3" }, |
|
|
|
{ I2CP_PARAM_OUTBOUND_TUNNELS_QUANTITY, "3" }, |
|
|
|
{ I2CP_PARAM_OUTBOUND_TUNNELS_QUANTITY, "3" }, |
|
|
|
{ I2CP_PARAM_LEASESET_TYPE, "3" }, |
|
|
|
{ I2CP_PARAM_LEASESET_TYPE, "3" }, |
|
|
|
{ I2CP_PARAM_LEASESET_ENCRYPTION_TYPE, "0,4" } |
|
|
|
{ I2CP_PARAM_LEASESET_ENCRYPTION_TYPE, "0,4" }, |
|
|
|
|
|
|
|
{ I2CP_PARAM_OUTBOUND_NICKNAME, "SharedDest" } |
|
|
|
}; |
|
|
|
}; |
|
|
|
m_SharedLocalDestination = CreateNewLocalDestination (false, i2p::data::SIGNING_KEY_TYPE_EDDSA_SHA512_ED25519, |
|
|
|
m_SharedLocalDestination = CreateNewLocalDestination (false, i2p::data::SIGNING_KEY_TYPE_EDDSA_SHA512_ED25519, |
|
|
|
i2p::data::CRYPTO_KEY_TYPE_ELGAMAL, ¶ms); // non-public, EDDSA
|
|
|
|
i2p::data::CRYPTO_KEY_TYPE_ELGAMAL, ¶ms); // non-public, EDDSA
|
|
|
@ -596,6 +597,11 @@ namespace client |
|
|
|
std::map<std::string, std::string> options; |
|
|
|
std::map<std::string, std::string> options; |
|
|
|
ReadI2CPOptions (section, false, options); |
|
|
|
ReadI2CPOptions (section, false, options); |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
// Set I2CP name if not set
|
|
|
|
|
|
|
|
auto itopt = options.find (I2CP_PARAM_OUTBOUND_NICKNAME); |
|
|
|
|
|
|
|
if (itopt == options.end ()) |
|
|
|
|
|
|
|
options[I2CP_PARAM_OUTBOUND_NICKNAME] = name; |
|
|
|
|
|
|
|
|
|
|
|
std::shared_ptr<ClientDestination> localDestination = nullptr; |
|
|
|
std::shared_ptr<ClientDestination> localDestination = nullptr; |
|
|
|
if (keys.length () > 0) |
|
|
|
if (keys.length () > 0) |
|
|
|
{ |
|
|
|
{ |
|
|
@ -750,6 +756,11 @@ namespace client |
|
|
|
std::map<std::string, std::string> options; |
|
|
|
std::map<std::string, std::string> options; |
|
|
|
ReadI2CPOptions (section, true, options); |
|
|
|
ReadI2CPOptions (section, true, options); |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
// Set I2CP name if not set
|
|
|
|
|
|
|
|
auto itopt = options.find (I2CP_PARAM_INBOUND_NICKNAME); |
|
|
|
|
|
|
|
if (itopt == options.end ()) |
|
|
|
|
|
|
|
options[I2CP_PARAM_INBOUND_NICKNAME] = name; |
|
|
|
|
|
|
|
|
|
|
|
std::shared_ptr<ClientDestination> localDestination = nullptr; |
|
|
|
std::shared_ptr<ClientDestination> localDestination = nullptr; |
|
|
|
auto it = destinations.find (keys); |
|
|
|
auto it = destinations.find (keys); |
|
|
|
if (it != destinations.end ()) |
|
|
|
if (it != destinations.end ()) |
|
|
@ -897,6 +908,7 @@ namespace client |
|
|
|
{ |
|
|
|
{ |
|
|
|
std::map<std::string, std::string> params; |
|
|
|
std::map<std::string, std::string> params; |
|
|
|
ReadI2CPOptionsFromConfig ("httpproxy.", params); |
|
|
|
ReadI2CPOptionsFromConfig ("httpproxy.", params); |
|
|
|
|
|
|
|
params[I2CP_PARAM_OUTBOUND_NICKNAME] = "HTTPProxy"; |
|
|
|
localDestination = CreateNewLocalDestination (keys, false, ¶ms); |
|
|
|
localDestination = CreateNewLocalDestination (keys, false, ¶ms); |
|
|
|
if (localDestination) localDestination->Acquire (); |
|
|
|
if (localDestination) localDestination->Acquire (); |
|
|
|
} |
|
|
|
} |
|
|
@ -945,6 +957,7 @@ namespace client |
|
|
|
{ |
|
|
|
{ |
|
|
|
std::map<std::string, std::string> params; |
|
|
|
std::map<std::string, std::string> params; |
|
|
|
ReadI2CPOptionsFromConfig ("socksproxy.", params); |
|
|
|
ReadI2CPOptionsFromConfig ("socksproxy.", params); |
|
|
|
|
|
|
|
params[I2CP_PARAM_OUTBOUND_NICKNAME] = "SOCKSProxy"; |
|
|
|
localDestination = CreateNewLocalDestination (keys, false, ¶ms); |
|
|
|
localDestination = CreateNewLocalDestination (keys, false, ¶ms); |
|
|
|
if (localDestination) localDestination->Acquire (); |
|
|
|
if (localDestination) localDestination->Acquire (); |
|
|
|
} |
|
|
|
} |
|
|
|