diff --git a/libi2pd/Destination.cpp b/libi2pd/Destination.cpp index de2a3ddb..f55454b7 100644 --- a/libi2pd/Destination.cpp +++ b/libi2pd/Destination.cpp @@ -13,7 +13,6 @@ #include #include #include "Crypto.h" -#include "Config.h" #include "Log.h" #include "FS.h" #include "Timestamp.h" @@ -36,7 +35,7 @@ namespace client int outLen = DEFAULT_OUTBOUND_TUNNEL_LENGTH; int outQty = DEFAULT_OUTBOUND_TUNNELS_QUANTITY; int inVar = DEFAULT_INBOUND_TUNNELS_LENGTH_VARIANCE; - int outVar = DEFAULT_OUTBOUND_TUNNELS_LENGTH_VARIANCE; + int outVar = DEFAULT_OUTBOUND_TUNNELS_LENGTH_VARIANCE; int numTags = DEFAULT_TAGS_TO_SEND; std::shared_ptr > explicitPeers; try @@ -94,9 +93,7 @@ namespace client if (it != params->end ()) { // oveeride isPublic - bool dontpublish = false; - i2p::config::GetOption (it->second, dontpublish); - m_IsPublic = !dontpublish; + m_IsPublic = (it->second != "true"); } it = params->find (I2CP_PARAM_LEASESET_TYPE); if (it != params->end ()) @@ -954,7 +951,7 @@ namespace client for (auto& it: encryptionKeyTypes) { auto encryptionKey = new EncryptionKey (it); - if (isPublic) + if (IsPublic ()) PersistTemporaryKeys (encryptionKey, isSingleKey); else encryptionKey->GenerateKeys (); @@ -969,7 +966,7 @@ namespace client m_StandardEncryptionKey.reset (encryptionKey); } - if (isPublic) + if (IsPublic ()) LogPrint (eLogInfo, "Destination: Local address ", GetIdentHash().ToBase32 (), " created"); try @@ -982,7 +979,7 @@ namespace client m_StreamingAckDelay = std::stoi(it->second); it = params->find (I2CP_PARAM_STREAMING_ANSWER_PINGS); if (it != params->end ()) - i2p::config::GetOption (it->second, m_IsStreamingAnswerPings); + m_IsStreamingAnswerPings = (it->second == "true"); if (GetLeaseSetType () == i2p::data::NETDB_STORE_TYPE_ENCRYPTED_LEASESET2) { diff --git a/libi2pd_client/BOB.cpp b/libi2pd_client/BOB.cpp index 61c5d531..c331dc78 100644 --- a/libi2pd_client/BOB.cpp +++ b/libi2pd_client/BOB.cpp @@ -1,5 +1,5 @@ /* -* Copyright (c) 2013-2020, The PurpleI2P Project +* Copyright (c) 2013-2022, The PurpleI2P Project * * This file is part of Purple i2pd project and licensed under BSD3 * @@ -704,7 +704,7 @@ namespace client msg += operand; *(const_cast(value)) = '='; msg += " set to "; - msg += value; + msg += value + 1; SendReplyOK (msg.c_str ()); } else