Merge remote-tracking branch 'purple/openssl'

Destination.cpp

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

I2PTunnel.cpp

@@ -62,10 +62,27 @@ namespace client
 	void I2PTunnelConnection::Connect ()
 	{
 		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,
 				shared_from_this (), std::placeholders::_1));
 		}
+	}	
 		
 	void I2PTunnelConnection::Terminate ()
 	{

SSUSession.cpp

@@ -991,7 +991,7 @@ namespace transport
 						else // v6
 						{
 							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);
 						}		
 						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 ())
 			{
-				*payload = 6;
+				*payload = 16;
 				memcpy (payload + 1, address.to_v6 ().to_bytes ().data (), 16); // our IP V6		
 			}
 			else