PurpleI2P/i2pd
1
0
Fork 0
mirror of https://github.com/PurpleI2P/i2pd.git synced 2025-01-22 08:14:15 +00:00
Code Issues Releases Activity

fixed crash if can't connect to a reseed

Browse Source
This commit is contained in:
orignal 2015-04-02 10:27:07 -04:00
parent cb9f78540a
commit 43f8ec46cc
2 changed files with 21 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
Reseed.cpp
View File

@ -500,17 +500,22 @@ namespace data
if (u.port_ == 80) u.port_ = 443; if (u.port_ == 80) u.port_ = 443;
TlsSession session (u.host_, u.port_); TlsSession session (u.host_, u.port_);
// send request if (session.IsEstablished ())
std::stringstream ss; {
ss << "GET " << u.path_ << " HTTP/1.1\r\nHost: " << u.host_ // send request
<< "\r\nAccept: */*\r\n" << "User-Agent: Wget/1.11.4\r\n" << "Connection: close\r\n\r\n"; std::stringstream ss;
session.Send ((uint8_t *)ss.str ().c_str (), ss.str ().length ()); ss << "GET " << u.path_ << " HTTP/1.1\r\nHost: " << u.host_
<< "\r\nAccept: */*\r\n" << "User-Agent: Wget/1.11.4\r\n" << "Connection: close\r\n\r\n";
session.Send ((uint8_t *)ss.str ().c_str (), ss.str ().length ());
// read response // read response
std::stringstream rs; std::stringstream rs;
while (session.Receive (rs)) while (session.Receive (rs))
; ;
return i2p::util::http::GetHttpContent (rs); return i2p::util::http::GetHttpContent (rs);
}
else
return "";
} }
//------------------------------------------------------------- //-------------------------------------------------------------
@ -622,13 +627,11 @@ namespace data
TlsSession::TlsSession (const std::string& host, int port): TlsSession::TlsSession (const std::string& host, int port):
m_Cipher (nullptr) m_IsEstablished (false), m_Cipher (nullptr)
{ {
m_Site.connect(host, boost::lexical_cast<std::string>(port)); m_Site.connect(host, boost::lexical_cast<std::string>(port));
if (m_Site.good ()) if (m_Site.good ())
{
Handshake (); Handshake ();
}
else else
LogPrint (eLogError, "Can't connect to ", host, ":", port); LogPrint (eLogError, "Can't connect to ", host, ":", port);
} }
@ -693,7 +696,9 @@ namespace data
LogPrint (eLogError, "Unexpected handshake type ", (int)serverHello[0]); LogPrint (eLogError, "Unexpected handshake type ", (int)serverHello[0]);
uint8_t sessionIDLen = serverHello[38]; // 6 + 32 uint8_t sessionIDLen = serverHello[38]; // 6 + 32
char * cipherSuite = serverHello + 39 + sessionIDLen; char * cipherSuite = serverHello + 39 + sessionIDLen;
if (cipherSuite[1] != 0x3D && cipherSuite[1] != 0x35 && cipherSuite[1] != 0x05) if (cipherSuite[1] == 0x3D || cipherSuite[1] == 0x35 || cipherSuite[1] == 0x05)
m_IsEstablished = true;
else
LogPrint (eLogError, "Unsupported cipher ", (int)cipherSuite[0], ",", (int)cipherSuite[1]); LogPrint (eLogError, "Unsupported cipher ", (int)cipherSuite[0], ",", (int)cipherSuite[1]);
// read Certificate // read Certificate
m_Site.read ((char *)&type, 1); m_Site.read ((char *)&type, 1);

2
Reseed.h
View File

@ -69,6 +69,7 @@ namespace data
~TlsSession (); ~TlsSession ();
void Send (const uint8_t * buf, size_t len); void Send (const uint8_t * buf, size_t len);
bool Receive (std::ostream& rs); bool Receive (std::ostream& rs);
bool IsEstablished () const { return m_IsEstablished; };
private: private:
@ -82,6 +83,7 @@ namespace data
private: private:
bool m_IsEstablished;
boost::asio::ip::tcp::iostream m_Site; boost::asio::ip::tcp::iostream m_Site;
CryptoPP::SHA256 m_FinishedHash; CryptoPP::SHA256 m_FinishedHash;
uint8_t m_MasterSecret[64]; // actual size is 48, but must be multiple of 32 uint8_t m_MasterSecret[64]; // actual size is 48, but must be multiple of 32