mirror of
https://github.com/PurpleI2P/i2pd.git
synced 2025-01-22 21:37:17 +01:00
implement i2cp session reconfigure
This commit is contained in:
parent
7b00d828b2
commit
938d5d901a
|
@ -169,6 +169,46 @@ namespace client
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
bool LeaseSetDestination::Reconfigure(std::map<std::string, std::string> params)
|
||||||
|
{
|
||||||
|
|
||||||
|
auto itr = params.find("i2cp.dontPublishLeaseSet");
|
||||||
|
if (itr != params.end())
|
||||||
|
{
|
||||||
|
m_IsPublic = itr->second != "true";
|
||||||
|
}
|
||||||
|
|
||||||
|
int inLen, outLen, inQuant, outQuant, numTags, minLatency, maxLatency;
|
||||||
|
std::map<std::string, int&> intOpts = {
|
||||||
|
{I2CP_PARAM_INBOUND_TUNNEL_LENGTH, inLen},
|
||||||
|
{I2CP_PARAM_OUTBOUND_TUNNEL_LENGTH, outLen},
|
||||||
|
{I2CP_PARAM_INBOUND_TUNNELS_QUANTITY, inQuant},
|
||||||
|
{I2CP_PARAM_OUTBOUND_TUNNELS_QUANTITY, outQuant},
|
||||||
|
{I2CP_PARAM_TAGS_TO_SEND, numTags},
|
||||||
|
{I2CP_PARAM_MIN_TUNNEL_LATENCY, minLatency},
|
||||||
|
{I2CP_PARAM_MAX_TUNNEL_LATENCY, maxLatency}
|
||||||
|
};
|
||||||
|
|
||||||
|
auto pool = GetTunnelPool();
|
||||||
|
inLen = pool->GetNumInboundHops();
|
||||||
|
outLen = pool->GetNumOutboundHops();
|
||||||
|
inQuant = pool->GetNumInboundTunnels();
|
||||||
|
outQuant = pool->GetNumOutboundTunnels();
|
||||||
|
minLatency = 0;
|
||||||
|
maxLatency = 0;
|
||||||
|
|
||||||
|
for (auto opt : intOpts)
|
||||||
|
{
|
||||||
|
itr = params.find(opt.first);
|
||||||
|
if(itr != params.end())
|
||||||
|
{
|
||||||
|
opt.second = std::stoi(itr->second);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
pool->RequireLatency(minLatency, maxLatency);
|
||||||
|
return pool->Reconfigure(inLen, outLen, inQuant, outQuant);
|
||||||
|
}
|
||||||
|
|
||||||
std::shared_ptr<const i2p::data::LeaseSet> LeaseSetDestination::FindLeaseSet (const i2p::data::IdentHash& ident)
|
std::shared_ptr<const i2p::data::LeaseSet> LeaseSetDestination::FindLeaseSet (const i2p::data::IdentHash& ident)
|
||||||
{
|
{
|
||||||
std::shared_ptr<i2p::data::LeaseSet> remoteLS;
|
std::shared_ptr<i2p::data::LeaseSet> remoteLS;
|
||||||
|
|
|
@ -96,6 +96,10 @@ namespace client
|
||||||
|
|
||||||
virtual bool Start ();
|
virtual bool Start ();
|
||||||
virtual bool Stop ();
|
virtual bool Stop ();
|
||||||
|
|
||||||
|
/** i2cp reconfigure */
|
||||||
|
virtual bool Reconfigure(std::map<std::string, std::string> i2cpOpts);
|
||||||
|
|
||||||
bool IsRunning () const { return m_IsRunning; };
|
bool IsRunning () const { return m_IsRunning; };
|
||||||
boost::asio::io_service& GetService () { return m_Service; };
|
boost::asio::io_service& GetService () { return m_Service; };
|
||||||
std::shared_ptr<i2p::tunnel::TunnelPool> GetTunnelPool () { return m_Pool; };
|
std::shared_ptr<i2p::tunnel::TunnelPool> GetTunnelPool () { return m_Pool; };
|
||||||
|
|
|
@ -69,6 +69,18 @@ namespace tunnel
|
||||||
m_Tests.clear ();
|
m_Tests.clear ();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
bool TunnelPool::Reconfigure(int inHops, int outHops, int inQuant, int outQuant) {
|
||||||
|
if( inHops >= 0 && outHops >= 0 && inQuant > 0 && outQuant > 0)
|
||||||
|
{
|
||||||
|
m_NumInboundHops = inHops;
|
||||||
|
m_NumOutboundHops = outHops;
|
||||||
|
m_NumInboundTunnels = inQuant;
|
||||||
|
m_NumOutboundTunnels = outQuant;
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
void TunnelPool::TunnelCreated (std::shared_ptr<InboundTunnel> createdTunnel)
|
void TunnelPool::TunnelCreated (std::shared_ptr<InboundTunnel> createdTunnel)
|
||||||
{
|
{
|
||||||
if (!m_IsActive) return;
|
if (!m_IsActive) return;
|
||||||
|
|
|
@ -78,6 +78,11 @@ namespace tunnel
|
||||||
|
|
||||||
int GetNumInboundTunnels () const { return m_NumInboundTunnels; };
|
int GetNumInboundTunnels () const { return m_NumInboundTunnels; };
|
||||||
int GetNumOutboundTunnels () const { return m_NumOutboundTunnels; };
|
int GetNumOutboundTunnels () const { return m_NumOutboundTunnels; };
|
||||||
|
int GetNumInboundHops() const { return m_NumInboundHops; };
|
||||||
|
int GetNumOutboundHops() const { return m_NumOutboundHops; };
|
||||||
|
|
||||||
|
/** i2cp reconfigure */
|
||||||
|
bool Reconfigure(int inboundHops, int outboundHops, int inboundQuant, int outboundQuant);
|
||||||
|
|
||||||
void SetCustomPeerSelector(ITunnelPeerSelector * selector);
|
void SetCustomPeerSelector(ITunnelPeerSelector * selector);
|
||||||
void UnsetCustomPeerSelector();
|
void UnsetCustomPeerSelector();
|
||||||
|
|
|
@ -416,8 +416,59 @@ namespace client
|
||||||
|
|
||||||
void I2CPSession::ReconfigureSessionMessageHandler (const uint8_t * buf, size_t len)
|
void I2CPSession::ReconfigureSessionMessageHandler (const uint8_t * buf, size_t len)
|
||||||
{
|
{
|
||||||
// TODO: implement actual reconfiguration
|
uint8_t status = 3; // rejected
|
||||||
SendSessionStatusMessage (2); // updated
|
if(len > sizeof(uint16_t))
|
||||||
|
{
|
||||||
|
uint16_t sessionID = bufbe16toh(buf);
|
||||||
|
if(sessionID == m_SessionID)
|
||||||
|
{
|
||||||
|
buf += sizeof(uint16_t);
|
||||||
|
const uint8_t * body = buf;
|
||||||
|
i2p::data::IdentityEx ident;
|
||||||
|
if(ident.FromBuffer(buf, len - sizeof(uint16_t)))
|
||||||
|
{
|
||||||
|
if (ident == *m_Destination->GetIdentity())
|
||||||
|
{
|
||||||
|
size_t identsz = ident.GetFullLen();
|
||||||
|
buf += identsz;
|
||||||
|
uint16_t optssize = bufbe16toh(buf);
|
||||||
|
if (optssize <= len - sizeof(uint16_t) - sizeof(uint64_t) - identsz - ident.GetSignatureLen() - sizeof(uint16_t))
|
||||||
|
{
|
||||||
|
buf += sizeof(uint16_t);
|
||||||
|
std::map<std::string, std::string> opts;
|
||||||
|
ExtractMapping(buf, optssize, opts);
|
||||||
|
buf += optssize;
|
||||||
|
//uint64_t date = bufbe64toh(buf);
|
||||||
|
buf += sizeof(uint64_t);
|
||||||
|
const uint8_t * sig = buf;
|
||||||
|
if(ident.Verify(body, len - sizeof(uint16_t), sig))
|
||||||
|
{
|
||||||
|
if(m_Destination->Reconfigure(opts))
|
||||||
|
{
|
||||||
|
LogPrint(eLogInfo, "I2CP: reconfigured destination");
|
||||||
|
status = 2; // updated
|
||||||
|
}
|
||||||
|
else
|
||||||
|
LogPrint(eLogWarning, "I2CP: failed to reconfigure destination");
|
||||||
|
}
|
||||||
|
else
|
||||||
|
LogPrint(eLogError, "I2CP: invalid reconfigure message signature");
|
||||||
|
}
|
||||||
|
else
|
||||||
|
LogPrint(eLogError, "I2CP: mapping size missmatch");
|
||||||
|
}
|
||||||
|
else
|
||||||
|
LogPrint(eLogError, "I2CP: destination missmatch");
|
||||||
|
}
|
||||||
|
else
|
||||||
|
LogPrint(eLogError, "I2CP: malfromed destination");
|
||||||
|
}
|
||||||
|
else
|
||||||
|
LogPrint(eLogError, "I2CP: session missmatch");
|
||||||
|
}
|
||||||
|
else
|
||||||
|
LogPrint(eLogError, "I2CP: short message");
|
||||||
|
SendSessionStatusMessage (status);
|
||||||
}
|
}
|
||||||
|
|
||||||
void I2CPSession::SendSessionStatusMessage (uint8_t status)
|
void I2CPSession::SendSessionStatusMessage (uint8_t status)
|
||||||
|
|
Loading…
Reference in a new issue