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

Merge remote-tracking branch 'purple/openssl'

Browse Source
This commit is contained in:
Jeff Becker 2016-09-01 11:28:04 -04:00
commit c9c58074fa
No known key found for this signature in database
GPG Key ID: AB950234D6EA286B
3 changed files with 23 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Destination.cpp
View File

@ -224,6 +224,7 @@ namespace client
void LeaseSetDestination::SetLeaseSet (i2p::data::LocalLeaseSet * newLeaseSet) void LeaseSetDestination::SetLeaseSet (i2p::data::LocalLeaseSet * newLeaseSet)
{ {
m_LeaseSet.reset (newLeaseSet); m_LeaseSet.reset (newLeaseSet);
i2p::garlic::GarlicDestination::SetLeaseSetUpdated ();
if (m_IsPublic) if (m_IsPublic)
{ {
m_PublishVerificationTimer.cancel (); m_PublishVerificationTimer.cancel ();
@ -414,7 +415,6 @@ namespace client
void LeaseSetDestination::SetLeaseSetUpdated () void LeaseSetDestination::SetLeaseSetUpdated ()
{ {
i2p::garlic::GarlicDestination::SetLeaseSetUpdated ();
UpdateLeaseSet (); UpdateLeaseSet ();
} }

19
I2PTunnel.cpp
View File

@ -62,10 +62,27 @@ namespace client
void I2PTunnelConnection::Connect () void I2PTunnelConnection::Connect ()
{ {
I2PTunnelSetSocketOptions(m_Socket); I2PTunnelSetSocketOptions(m_Socket);
if (m_Socket) if (m_Socket) {
#ifdef __linux__
// bind to 127.x.x.x address
// where x.x.x are first three bytes from ident
if (m_RemoteEndpoint.address ().is_v4 () &&
m_RemoteEndpoint.address ().to_v4 ().to_bytes ()[0] == 127)
{
m_Socket->open (boost::asio::ip::tcp::v4 ());
boost::asio::ip::address_v4::bytes_type bytes;
const uint8_t * ident = m_Stream->GetRemoteIdentity ()->GetIdentHash ();
bytes[0] = 127;
memcpy (bytes.data ()+1, ident, 3);
boost::asio::ip::address ourIP = boost::asio::ip::address_v4 (bytes);
m_Socket->bind (boost::asio::ip::tcp::endpoint (ourIP, 0));
}
#endif
m_Socket->async_connect (m_RemoteEndpoint, std::bind (&I2PTunnelConnection::HandleConnect, m_Socket->async_connect (m_RemoteEndpoint, std::bind (&I2PTunnelConnection::HandleConnect,
shared_from_this (), std::placeholders::_1)); shared_from_this (), std::placeholders::_1));
} }
}
void I2PTunnelConnection::Terminate () void I2PTunnelConnection::Terminate ()
{ {

4
SSUSession.cpp
View File

@ -991,7 +991,7 @@ namespace transport
else // v6 else // v6
{ {
boost::asio::ip::address_v6::bytes_type bytes; boost::asio::ip::address_v6::bytes_type bytes;
memcpy (bytes.data (), address, 6); memcpy (bytes.data (), address, 16);
addr = boost::asio::ip::address_v6 (bytes); addr = boost::asio::ip::address_v6 (bytes);
} }
SendPeerTest (nonce, addr, be16toh (port), introKey); // to Alice with her address received from Bob SendPeerTest (nonce, addr, be16toh (port), introKey); // to Alice with her address received from Bob
@ -1033,7 +1033,7 @@ namespace transport
} }
else if (address.is_v6 ()) else if (address.is_v6 ())
{ {
*payload = 6; *payload = 16;
memcpy (payload + 1, address.to_v6 ().to_bytes ().data (), 16); // our IP V6 memcpy (payload + 1, address.to_v6 ().to_bytes ().data (), 16); // our IP V6
} }
else else