PurpleI2P
/
i2pd
mirror of https://github.com/PurpleI2P/i2pd.git
1
0
Fork 0
Code Issues Releases Activity
Browse Source

try to find destination at every connect attempt

pull/93/head
orignal 10 years ago
parent
d8918edb51
commit
fcb45a778b
3 changed files with 91 additions and 70 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 53
      AddressBook.cpp
  2. 2
      AddressBook.h
  3. 22
      I2PTunnel.cpp

53
AddressBook.cpp
Unescape View File

@ -14,35 +14,30 @@ namespace i2p
namespace data namespace data
{ {
AddressBook::AddressBook (): m_IsLoaded (false) AddressBook::AddressBook (): m_IsLoaded (false), m_IsDowloading (false)
{ {
} }
const IdentHash * AddressBook::FindAddress (const std::string& address) const IdentHash * AddressBook::FindAddress (const std::string& address)
{ {
if (!m_IsLoaded) if (!m_IsLoaded)
LoadHosts (); LoadHosts ();
if (m_IsLoaded)
{
auto it = m_Addresses.find (address); auto it = m_Addresses.find (address);
if (it != m_Addresses.end ()) if (it != m_Addresses.end ())
return &it->second; return &it->second;
else }
return nullptr; return nullptr;
} }
void AddressBook::LoadHostsFromI2P () void AddressBook::LoadHostsFromI2P ()
{
std::string content;
while (true)
{ {
// TODO: hosts link in config std::string content;
int http_code = i2p::util::http::httpRequestViaI2pProxy("http://udhdrtrcetjm5sxzskjyr5ztpeszydbh4dpl3pl4utgqqw2v4jna.b32.i2p/hosts.txt", content); int http_code = i2p::util::http::httpRequestViaI2pProxy("http://udhdrtrcetjm5sxzskjyr5ztpeszydbh4dpl3pl4utgqqw2v4jna.b32.i2p/hosts.txt", content);
if (http_code ==200) if (http_code == 200)
if (!boost::starts_with(content, "<html>") && !content.empty()) // TODO: test and remove {
break;
std::this_thread::sleep_for(std::chrono::seconds(5));
}
std::ofstream f_save(i2p::util::filesystem::GetFullPath("hosts.txt").c_str(), std::ofstream::out); std::ofstream f_save(i2p::util::filesystem::GetFullPath("hosts.txt").c_str(), std::ofstream::out);
if (f_save.is_open()) if (f_save.is_open())
{ {
@ -52,18 +47,26 @@ void AddressBook::LoadHostsFromI2P ()
else else
LogPrint("Can't write hosts.txt"); LogPrint("Can't write hosts.txt");
m_IsLoaded = false; m_IsLoaded = false;
}
else
LogPrint ("Failed to download hosts.txt");
m_IsDowloading = false;
return; return;
} }
void AddressBook::LoadHosts () void AddressBook::LoadHosts ()
{ {
m_IsLoaded = true;
std::ifstream f (i2p::util::filesystem::GetFullPath ("hosts.txt").c_str (), std::ofstream::in); // in text mode std::ifstream f (i2p::util::filesystem::GetFullPath ("hosts.txt").c_str (), std::ofstream::in); // in text mode
if (!f.is_open ()) if (!f.is_open ())
{ {
LogPrint ("hosts.txt not found. Try to load..."); LogPrint ("hosts.txt not found. Try to load...");
if (!m_IsDowloading)
{
m_IsDowloading = true;
std::thread load_hosts(&AddressBook::LoadHostsFromI2P, this); std::thread load_hosts(&AddressBook::LoadHostsFromI2P, this);
load_hosts.detach(); load_hosts.detach();
}
return; return;
} }
int numAddresses = 0; int numAddresses = 0;
@ -85,7 +88,8 @@ void AddressBook::LoadHosts ()
std::string addr = s.substr(pos); std::string addr = s.substr(pos);
Identity ident; Identity ident;
if (!ident.FromBase64(addr)) { if (!ident.FromBase64(addr))
{
LogPrint ("hosts.txt: ignore ", name); LogPrint ("hosts.txt: ignore ", name);
continue; continue;
} }
@ -94,7 +98,8 @@ void AddressBook::LoadHosts ()
} }
} }
LogPrint (numAddresses, " addresses loaded"); LogPrint (numAddresses, " addresses loaded");
} m_IsLoaded = true;
}
} }
} }

2
AddressBook.h
Unescape View File

@ -26,7 +26,7 @@ namespace data
void LoadHostsFromI2P (); void LoadHostsFromI2P ();
std::map<std::string, IdentHash> m_Addresses; std::map<std::string, IdentHash> m_Addresses;
bool m_IsLoaded; bool m_IsLoaded, m_IsDowloading;
}; };
} }
} }

22
I2PTunnel.cpp
Unescape View File

@ -131,7 +131,6 @@ namespace stream
for (auto it: m_Connections) for (auto it: m_Connections)
delete it; delete it;
m_Connections.clear (); m_Connections.clear ();
delete m_DestinationIdentHash;
m_DestinationIdentHash = nullptr; m_DestinationIdentHash = nullptr;
} }
@ -146,16 +145,33 @@ namespace stream
{ {
if (!ecode) if (!ecode)
{ {
if (!m_RemoteLeaseSet && m_DestinationIdentHash) if (!m_RemoteLeaseSet)
{
// try to get it
if (m_DestinationIdentHash)
m_RemoteLeaseSet = i2p::data::netdb.FindLeaseSet (*m_DestinationIdentHash); m_RemoteLeaseSet = i2p::data::netdb.FindLeaseSet (*m_DestinationIdentHash);
if (m_RemoteLeaseSet) else
{
auto identHash = i2p::data::netdb.FindAddress (m_Destination);
if (identHash)
{
m_DestinationIdentHash = new i2p::data::IdentHash (*identHash);
i2p::data::netdb.Subscribe (*m_DestinationIdentHash);
}
}
}
if (m_RemoteLeaseSet) // leaseSet found
{ {
LogPrint ("New I2PTunnel connection"); LogPrint ("New I2PTunnel connection");
auto connection = new I2PTunnelConnection (socket, m_RemoteLeaseSet); auto connection = new I2PTunnelConnection (socket, m_RemoteLeaseSet);
m_Connections.insert (connection); m_Connections.insert (connection);
} }
else else
{
LogPrint ("LeaseSet for I2PTunnel destination not found");
delete socket; delete socket;
}
Accept (); Accept ();
} }
else else

Write Preview
Loading…
Cancel
Save