PurpleI2P/i2pd
1
0
Fork 0
mirror of https://github.com/PurpleI2P/i2pd.git synced 2025-01-31 04:44:13 +00:00
Code Issues Releases Activity

rewrite tunnel path inversion code

Browse Source
This commit is contained in:
orignal 2015-05-08 14:07:33 -04:00
parent 39c346df10
commit 188f1fcff8
1 changed files with 21 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

55
TunnelConfig.h
View File

@ -107,7 +107,7 @@ namespace tunnel
} }
}; };
class TunnelConfig class TunnelConfig: public std::enable_shared_from_this<TunnelConfig>
{ {
public: public:
@ -170,10 +170,24 @@ namespace tunnel
return num; return num;
} }
bool IsInbound () const { return m_FirstHop->isGateway; }
std::vector<std::shared_ptr<const i2p::data::RouterInfo> > GetPeers () const
{
std::vector<std::shared_ptr<const i2p::data::RouterInfo> > peers;
TunnelHopConfig * hop = m_FirstHop;
while (hop)
{
peers.push_back (hop->router);
hop = hop->next;
}
return peers;
}
void Print (std::stringstream& s) const void Print (std::stringstream& s) const
{ {
TunnelHopConfig * hop = m_FirstHop; TunnelHopConfig * hop = m_FirstHop;
if (!m_FirstHop->isGateway) if (!IsInbound ()) // outbound
s << "me"; s << "me";
s << "-->" << m_FirstHop->tunnelID; s << "-->" << m_FirstHop->tunnelID;
while (hop) while (hop)
@ -191,42 +205,15 @@ namespace tunnel
std::shared_ptr<TunnelConfig> Invert () const std::shared_ptr<TunnelConfig> Invert () const
{ {
auto newConfig = new TunnelConfig (); auto peers = GetPeers ();
TunnelHopConfig * hop = m_FirstHop, * nextNewHop = nullptr; std::reverse (peers.begin (), peers.end ());
while (hop) // we use ourself as reply tunnel for outbound tunnel
{ return IsInbound () ? std::make_shared<TunnelConfig>(peers, shared_from_this ()) : std::make_shared<TunnelConfig>(peers);
TunnelHopConfig * newHop = new TunnelHopConfig (hop->router);
if (nextNewHop)
newHop->SetNext (nextNewHop);
nextNewHop = newHop;
newHop->isEndpoint = hop->isGateway;
newHop->isGateway = hop->isEndpoint;
if (!hop->prev) // first hop
{
newConfig->m_LastHop = newHop;
if (hop->isGateway) // inbound tunnel
newHop->SetReplyHop (m_FirstHop); // use it as reply tunnel
else
newHop->SetNextRouter (i2p::context.GetSharedRouterInfo ());
}
if (!hop->next) newConfig->m_FirstHop = newHop; // last hop
hop = hop->next;
}
return std::shared_ptr<TunnelConfig>(newConfig);
} }
std::shared_ptr<TunnelConfig> Clone (std::shared_ptr<const TunnelConfig> replyTunnelConfig = nullptr) const std::shared_ptr<TunnelConfig> Clone (std::shared_ptr<const TunnelConfig> replyTunnelConfig = nullptr) const
{ {
std::vector<std::shared_ptr<const i2p::data::RouterInfo> > peers; return std::make_shared<TunnelConfig> (GetPeers (), replyTunnelConfig);
TunnelHopConfig * hop = m_FirstHop;
while (hop)
{
peers.push_back (hop->router);
hop = hop->next;
}
return std::make_shared<TunnelConfig> (peers, replyTunnelConfig);
} }
private: private: