mirrors/i2pd
2
0
Fork 0
mirror of https://github.com/PurpleI2P/i2pd synced 2024-09-20 02:10:19 +03:00
Code Issues Packages Projects Releases Wiki Activity

request RouterInfo for newly dicovered floodfills

Browse Source
This commit is contained in:
orignal 2013-11-27 21:28:32 -05:00
parent 01cb5e02e9
commit fbbcc69c72
2 changed files with 136 additions and 59 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

182
NetDb.cpp
View File

@ -1,5 +1,6 @@
#include <fstream> #include <fstream>
#include <boost/filesystem.hpp> #include <boost/filesystem.hpp>
#include <cryptopp/gzip.h>
#include "base64.h" #include "base64.h"
#include "Log.h" #include "Log.h"
#include "Timestamp.h" #include "Timestamp.h"
@ -51,35 +52,42 @@ namespace data
m_IsRunning = true; m_IsRunning = true;
while (m_IsRunning) while (m_IsRunning)
{ {
I2NPMessage * msg = m_Queue.GetNextWithTimeout (10000); // 10 sec try
if (msg)
{ {
while (msg) I2NPMessage * msg = m_Queue.GetNextWithTimeout (10000); // 10 sec
if (msg)
{ {
if (msg->GetHeader ()->typeID == eI2NPDatabaseStore) while (msg)
{ {
i2p::HandleDatabaseStoreMsg (msg->GetPayload (), msg->GetLength ()); // TODO if (msg->GetHeader ()->typeID == eI2NPDatabaseStore)
i2p::DeleteI2NPMessage (msg); {
HandleDatabaseStoreMsg (msg->GetPayload (), msg->GetLength ()); // TODO
i2p::DeleteI2NPMessage (msg);
}
else if (msg->GetHeader ()->typeID == eI2NPDatabaseSearchReply)
HandleDatabaseSearchReplyMsg (msg);
else // WTF?
{
LogPrint ("NetDb: unexpected message type ", msg->GetHeader ()->typeID);
i2p::HandleI2NPMessage (msg);
}
msg = m_Queue.Get ();
} }
else if (msg->GetHeader ()->typeID == eI2NPDatabaseSearchReply) }
HandleDatabaseSearchReplyMsg (msg); else // if no new DatabaseStore coming, explore it
else // WTF? Explore ();
{
LogPrint ("NetDb: unexpected message type ", msg->GetHeader ()->typeID); uint32_t ts = i2p::util::GetSecondsSinceEpoch ();
i2p::HandleI2NPMessage (msg); if (ts - lastTs >= 60) // save routers every minute
} {
msg = m_Queue.Get (); if (lastTs)
SaveUpdated ("netDb");
lastTs = ts;
} }
} }
else // if no new DatabaseStore coming, explore it catch (std::exception& ex)
Explore ();
uint32_t ts = i2p::util::GetSecondsSinceEpoch ();
if (ts - lastTs >= 60) // save routers every minute
{ {
if (lastTs) LogPrint ("NetDb: ", ex.what ());
SaveUpdated ("netDb");
lastTs = ts;
} }
} }
} }
@ -87,7 +95,23 @@ namespace data
void NetDb::AddRouterInfo (uint8_t * buf, int len) void NetDb::AddRouterInfo (uint8_t * buf, int len)
{ {
RouterInfo * r = new RouterInfo (buf, len); RouterInfo * r = new RouterInfo (buf, len);
m_RouterInfos[std::string ((const char *)r->GetIdentHash (), 32)] = r; std::string hash((const char *)r->GetIdentHash (), 32);
auto it = m_RouterInfos.find(hash);
if (it != m_RouterInfos.end ())
{
if (r->GetTimestamp () > it->second->GetTimestamp ())
{
LogPrint ("RouterInfo updated");
*m_RouterInfos[hash] = *r; // we can't replace point because it's used by tunnels
}
else
delete r;
}
else
{
LogPrint ("New RouterInfo added");
m_RouterInfos[hash] = r;
}
} }
void NetDb::AddLeaseSet (uint8_t * buf, int len) void NetDb::AddLeaseSet (uint8_t * buf, int len)
@ -96,7 +120,7 @@ namespace data
m_LeaseSets[std::string ((const char *)l->GetIdentHash (), 32)] = l; m_LeaseSets[std::string ((const char *)l->GetIdentHash (), 32)] = l;
} }
RouterInfo * NetDb::FindRouter (const uint8_t * ident) RouterInfo * NetDb::FindRouter (const uint8_t * ident) const
{ {
auto it = m_RouterInfos.find (std::string ((const char *)ident, 32)); auto it = m_RouterInfos.find (std::string ((const char *)ident, 32));
if (it != m_RouterInfos.end ()) if (it != m_RouterInfos.end ())
@ -136,14 +160,22 @@ namespace data
for (auto it: m_RouterInfos) for (auto it: m_RouterInfos)
if (it.second->IsUpdated ()) if (it.second->IsUpdated ())
{ {
std::ofstream r (std::string (directory) + "/routerInfo-" + std::ofstream r (std::string (directory) + "/r" +
it.second->GetIdentHashBase64 ()[0] + "/routerInfo-" +
it.second->GetIdentHashBase64 () + ".dat"); it.second->GetIdentHashBase64 () + ".dat");
r.write ((char *)it.second->GetBuffer (), it.second->GetBufferLen ()); r.write ((char *)it.second->GetBuffer (), it.second->GetBufferLen ());
it.second->SetUpdated (false); it.second->SetUpdated (false);
count++; count++;
} }
if (count > 0) if (count > 0)
LogPrint (count," new routers saved"); LogPrint (count," new/updated routers saved");
}
void NetDb::RequestDestination (const char * b32, const uint8_t * router)
{
uint8_t destination[32];
Base32ToByteStream (b32, strlen(b32), destination, 32);
RequestDestination (destination, router);
} }
void NetDb::RequestDestination (const uint8_t * destination, const uint8_t * router) void NetDb::RequestDestination (const uint8_t * destination, const uint8_t * router)
@ -165,21 +197,35 @@ namespace data
LogPrint ("No outbound tunnels found"); LogPrint ("No outbound tunnels found");
} }
void NetDb::HandleDatabaseSearchReply (const uint8_t * key, const uint8_t * router) void NetDb::HandleDatabaseStoreMsg (uint8_t * buf, size_t len)
{ {
if (!memcmp (m_Exploratory, key, 32)) I2NPDatabaseStoreMsg * msg = (I2NPDatabaseStoreMsg *)buf;
size_t offset = sizeof (I2NPDatabaseStoreMsg);
if (msg->replyToken)
offset += 36;
if (msg->type)
{ {
if (m_RouterInfos.find (std::string ((const char *)router, 32)) == m_RouterInfos.end ()) LogPrint ("LeaseSet");
{ AddLeaseSet (buf + offset, len - offset);
LogPrint ("Found new router. Requesting RouterInfo ..."); }
if (m_LastFloodfill) else
RequestDestination (router, m_LastFloodfill->GetIdentHash ()); {
} LogPrint ("RouterInfo");
else size_t size = be16toh (*(uint16_t *)(buf + offset));
LogPrint ("Bayan"); if (size > 2048)
{
LogPrint ("Invalid RouterInfo length ", (int)size);
return;
}
offset += 2;
CryptoPP::Gunzip decompressor;
decompressor.Put (buf + offset, size);
decompressor.MessageEnd();
uint8_t uncompressed[2048];
int uncomressedSize = decompressor.MaxRetrievable ();
decompressor.Get (uncompressed, uncomressedSize);
AddRouterInfo (uncompressed, uncomressedSize);
} }
// else
// RequestDestination (key, router);
} }
void NetDb::HandleDatabaseSearchReplyMsg (I2NPMessage * msg) void NetDb::HandleDatabaseSearchReplyMsg (I2NPMessage * msg)
@ -192,28 +238,58 @@ namespace data
LogPrint ("DatabaseSearchReply for ", key, " num=", num); LogPrint ("DatabaseSearchReply for ", key, " num=", num);
if (num > 0) if (num > 0)
{ {
if (!memcmp (m_Exploratory, buf, 32) && m_LastFloodfill) bool isExploratory = !memcmp (m_Exploratory, buf, 32) && m_LastFloodfill;
{ i2p::tunnel::OutboundTunnel * outbound = i2p::tunnel::tunnels.GetNextOutboundTunnel ();
i2p::tunnel::OutboundTunnel * outbound = i2p::tunnel::tunnels.GetNextOutboundTunnel (); i2p::tunnel::InboundTunnel * inbound = i2p::tunnel::tunnels.GetNextInboundTunnel ();
i2p::tunnel::InboundTunnel * inbound = i2p::tunnel::tunnels.GetNextInboundTunnel ();
for (int i = 0; i < num; i++)
{
uint8_t * router = buf + 33 + i*32;
char peerHash[48];
int l1 = i2p::data::ByteStreamToBase64 (router, 32, peerHash, 48);
peerHash[l1] = 0;
LogPrint (i,": ", peerHash);
for (int i = 0; i < num; i++)
{
uint8_t * router = buf + 33 + i*32;
char peerHash[48];
int l1 = i2p::data::ByteStreamToBase64 (router, 32, peerHash, 48);
peerHash[l1] = 0;
LogPrint (i,": ", peerHash);
if (isExploratory)
{
if (m_RouterInfos.find (std::string ((const char *)router, 32)) == m_RouterInfos.end ())
{
LogPrint ("Found new router. Requesting RouterInfo ...");
if (outbound && inbound)
{
I2NPMessage * msg = i2p::CreateDatabaseLookupMsg (router, inbound->GetNextIdentHash (),
inbound->GetNextTunnelID ());
outbound->GetTunnelGateway ().PutTunnelDataMsg (m_LastFloodfill->GetIdentHash (), 0, msg);
}
}
else
LogPrint ("Bayan");
}
else
{
// reply to our destination. Try other floodfills
if (outbound && inbound) if (outbound && inbound)
{ {
I2NPMessage * msg = i2p::CreateDatabaseLookupMsg (router, inbound->GetNextIdentHash (), // do we have that floodfill router in our database?
if (!FindRouter (router))
{
// request router
LogPrint ("Found new floodfill. Request it");
msg = i2p::CreateDatabaseLookupMsg (router, inbound->GetNextIdentHash (),
inbound->GetNextTunnelID ());
outbound->GetTunnelGateway ().PutTunnelDataMsg (
GetRandomNTCPRouter (true)->GetIdentHash (), 0, msg);
// request destination
I2NPMessage * msg = i2p::CreateDatabaseLookupMsg (buf, inbound->GetNextIdentHash (),
inbound->GetNextTunnelID ()); inbound->GetNextTunnelID ());
outbound->GetTunnelGateway ().PutTunnelDataMsg (m_LastFloodfill->GetIdentHash (), 0, msg); outbound->GetTunnelGateway ().PutTunnelDataMsg (router, 0, msg);
}
} }
} }
if (outbound)
outbound->GetTunnelGateway ().SendBuffer ();
} }
if (outbound)
outbound->GetTunnelGateway ().SendBuffer ();
} }
i2p::DeleteI2NPMessage (msg); i2p::DeleteI2NPMessage (msg);
} }

5
NetDb.h
View File

@ -26,10 +26,11 @@ namespace data
void AddRouterInfo (uint8_t * buf, int len); void AddRouterInfo (uint8_t * buf, int len);
void AddLeaseSet (uint8_t * buf, int len); void AddLeaseSet (uint8_t * buf, int len);
RouterInfo * FindRouter (const uint8_t * ident); RouterInfo * FindRouter (const uint8_t * ident) const;
void RequestDestination (const char * b32, const uint8_t * router); // in base32
void RequestDestination (const uint8_t * destination, const uint8_t * router); void RequestDestination (const uint8_t * destination, const uint8_t * router);
void HandleDatabaseSearchReply (const uint8_t * key, const uint8_t * router); void HandleDatabaseStoreMsg (uint8_t * buf, size_t len);
void HandleDatabaseSearchReplyMsg (I2NPMessage * msg); void HandleDatabaseSearchReplyMsg (I2NPMessage * msg);
const RouterInfo * GetRandomNTCPRouter (bool floodfillOnly = false) const; const RouterInfo * GetRandomNTCPRouter (bool floodfillOnly = false) const;