mirror of
https://github.com/PurpleI2P/i2pd.git
synced 2025-01-22 08:14:15 +00:00
shared pointer for I2PTunnelConnection
This commit is contained in:
parent
0262a8b057
commit
97656e7349
@ -1,4 +1,3 @@
|
|||||||
#include <boost/bind.hpp>
|
|
||||||
#include "base64.h"
|
#include "base64.h"
|
||||||
#include "Log.h"
|
#include "Log.h"
|
||||||
#include "NetDb.h"
|
#include "NetDb.h"
|
||||||
@ -12,21 +11,15 @@ namespace client
|
|||||||
{
|
{
|
||||||
I2PTunnelConnection::I2PTunnelConnection (I2PTunnel * owner,
|
I2PTunnelConnection::I2PTunnelConnection (I2PTunnel * owner,
|
||||||
boost::asio::ip::tcp::socket * socket, const i2p::data::LeaseSet * leaseSet):
|
boost::asio::ip::tcp::socket * socket, const i2p::data::LeaseSet * leaseSet):
|
||||||
m_Socket (socket), m_Owner (owner)
|
m_Socket (socket), m_Owner (owner), m_RemoteEndpoint (socket->remote_endpoint ())
|
||||||
{
|
{
|
||||||
m_Stream = m_Owner->GetLocalDestination ()->CreateStream (*leaseSet);
|
m_Stream = m_Owner->GetLocalDestination ()->CreateStream (*leaseSet);
|
||||||
m_Stream->Send (m_Buffer, 0); // connect
|
|
||||||
StreamReceive ();
|
|
||||||
Receive ();
|
|
||||||
}
|
}
|
||||||
|
|
||||||
I2PTunnelConnection::I2PTunnelConnection (I2PTunnel * owner, std::shared_ptr<i2p::stream::Stream> stream,
|
I2PTunnelConnection::I2PTunnelConnection (I2PTunnel * owner, std::shared_ptr<i2p::stream::Stream> stream,
|
||||||
boost::asio::ip::tcp::socket * socket, const boost::asio::ip::tcp::endpoint& target):
|
boost::asio::ip::tcp::socket * socket, const boost::asio::ip::tcp::endpoint& target):
|
||||||
m_Socket (socket), m_Stream (stream), m_Owner (owner)
|
m_Socket (socket), m_Stream (stream), m_Owner (owner), m_RemoteEndpoint (target)
|
||||||
{
|
{
|
||||||
if (m_Socket)
|
|
||||||
m_Socket->async_connect (target, boost::bind (&I2PTunnelConnection::HandleConnect,
|
|
||||||
this, boost::asio::placeholders::error));
|
|
||||||
}
|
}
|
||||||
|
|
||||||
I2PTunnelConnection::~I2PTunnelConnection ()
|
I2PTunnelConnection::~I2PTunnelConnection ()
|
||||||
@ -34,6 +27,20 @@ namespace client
|
|||||||
delete m_Socket;
|
delete m_Socket;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
void I2PTunnelConnection::I2PConnect ()
|
||||||
|
{
|
||||||
|
m_Stream->Send (m_Buffer, 0); // connect
|
||||||
|
StreamReceive ();
|
||||||
|
Receive ();
|
||||||
|
}
|
||||||
|
|
||||||
|
void I2PTunnelConnection::Connect ()
|
||||||
|
{
|
||||||
|
if (m_Socket)
|
||||||
|
m_Socket->async_connect (m_RemoteEndpoint, std::bind (&I2PTunnelConnection::HandleConnect,
|
||||||
|
shared_from_this (), std::placeholders::_1));
|
||||||
|
}
|
||||||
|
|
||||||
void I2PTunnelConnection::Terminate ()
|
void I2PTunnelConnection::Terminate ()
|
||||||
{
|
{
|
||||||
if (m_Stream)
|
if (m_Stream)
|
||||||
@ -44,15 +51,14 @@ namespace client
|
|||||||
}
|
}
|
||||||
m_Socket->close ();
|
m_Socket->close ();
|
||||||
if (m_Owner)
|
if (m_Owner)
|
||||||
m_Owner->RemoveConnection (this);
|
m_Owner->RemoveConnection (shared_from_this ());
|
||||||
//delete this;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
void I2PTunnelConnection::Receive ()
|
void I2PTunnelConnection::Receive ()
|
||||||
{
|
{
|
||||||
m_Socket->async_read_some (boost::asio::buffer(m_Buffer, I2P_TUNNEL_CONNECTION_BUFFER_SIZE),
|
m_Socket->async_read_some (boost::asio::buffer(m_Buffer, I2P_TUNNEL_CONNECTION_BUFFER_SIZE),
|
||||||
boost::bind(&I2PTunnelConnection::HandleReceived, this,
|
std::bind(&I2PTunnelConnection::HandleReceived, shared_from_this (),
|
||||||
boost::asio::placeholders::error, boost::asio::placeholders::bytes_transferred));
|
std::placeholders::_1, std::placeholders::_2));
|
||||||
}
|
}
|
||||||
|
|
||||||
void I2PTunnelConnection::HandleReceived (const boost::system::error_code& ecode, std::size_t bytes_transferred)
|
void I2PTunnelConnection::HandleReceived (const boost::system::error_code& ecode, std::size_t bytes_transferred)
|
||||||
@ -87,8 +93,8 @@ namespace client
|
|||||||
{
|
{
|
||||||
if (m_Stream)
|
if (m_Stream)
|
||||||
m_Stream->AsyncReceive (boost::asio::buffer (m_StreamBuffer, I2P_TUNNEL_CONNECTION_BUFFER_SIZE),
|
m_Stream->AsyncReceive (boost::asio::buffer (m_StreamBuffer, I2P_TUNNEL_CONNECTION_BUFFER_SIZE),
|
||||||
boost::bind (&I2PTunnelConnection::HandleStreamReceive, this,
|
std::bind (&I2PTunnelConnection::HandleStreamReceive, shared_from_this (),
|
||||||
boost::asio::placeholders::error, boost::asio::placeholders::bytes_transferred),
|
std::placeholders::_1, std::placeholders::_2),
|
||||||
I2P_TUNNEL_CONNECTION_MAX_IDLE);
|
I2P_TUNNEL_CONNECTION_MAX_IDLE);
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -103,7 +109,7 @@ namespace client
|
|||||||
else
|
else
|
||||||
{
|
{
|
||||||
boost::asio::async_write (*m_Socket, boost::asio::buffer (m_StreamBuffer, bytes_transferred),
|
boost::asio::async_write (*m_Socket, boost::asio::buffer (m_StreamBuffer, bytes_transferred),
|
||||||
boost::bind (&I2PTunnelConnection::HandleWrite, this, boost::asio::placeholders::error));
|
std::bind (&I2PTunnelConnection::HandleWrite, shared_from_this (), std::placeholders::_1));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -112,12 +118,7 @@ namespace client
|
|||||||
if (ecode)
|
if (ecode)
|
||||||
{
|
{
|
||||||
LogPrint ("I2PTunnel connect error: ", ecode.message ());
|
LogPrint ("I2PTunnel connect error: ", ecode.message ());
|
||||||
if (ecode != boost::asio::error::operation_aborted)
|
Terminate ();
|
||||||
{
|
|
||||||
if (m_Stream) m_Stream->Close ();
|
|
||||||
i2p::stream::DeleteStream (m_Stream);
|
|
||||||
m_Stream = nullptr;
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
@ -127,20 +128,18 @@ namespace client
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
void I2PTunnel::AddConnection (I2PTunnelConnection * conn)
|
void I2PTunnel::AddConnection (std::shared_ptr<I2PTunnelConnection> conn)
|
||||||
{
|
{
|
||||||
m_Connections.insert (conn);
|
m_Connections.insert (conn);
|
||||||
}
|
}
|
||||||
|
|
||||||
void I2PTunnel::RemoveConnection (I2PTunnelConnection * conn)
|
void I2PTunnel::RemoveConnection (std::shared_ptr<I2PTunnelConnection> conn)
|
||||||
{
|
{
|
||||||
m_Connections.erase (conn);
|
m_Connections.erase (conn);
|
||||||
}
|
}
|
||||||
|
|
||||||
void I2PTunnel::ClearConnections ()
|
void I2PTunnel::ClearConnections ()
|
||||||
{
|
{
|
||||||
for (auto it: m_Connections)
|
|
||||||
delete it;
|
|
||||||
m_Connections.clear ();
|
m_Connections.clear ();
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -181,8 +180,8 @@ namespace client
|
|||||||
void I2PClientTunnel::Accept ()
|
void I2PClientTunnel::Accept ()
|
||||||
{
|
{
|
||||||
auto newSocket = new boost::asio::ip::tcp::socket (GetService ());
|
auto newSocket = new boost::asio::ip::tcp::socket (GetService ());
|
||||||
m_Acceptor.async_accept (*newSocket, boost::bind (&I2PClientTunnel::HandleAccept, this,
|
m_Acceptor.async_accept (*newSocket, std::bind (&I2PClientTunnel::HandleAccept, this,
|
||||||
boost::asio::placeholders::error, newSocket));
|
std::placeholders::_1, newSocket));
|
||||||
}
|
}
|
||||||
|
|
||||||
void I2PClientTunnel::HandleAccept (const boost::system::error_code& ecode, boost::asio::ip::tcp::socket * socket)
|
void I2PClientTunnel::HandleAccept (const boost::system::error_code& ecode, boost::asio::ip::tcp::socket * socket)
|
||||||
@ -205,8 +204,8 @@ namespace client
|
|||||||
{
|
{
|
||||||
i2p::data::netdb.RequestDestination (*m_DestinationIdentHash, true, GetLocalDestination ()->GetTunnelPool ());
|
i2p::data::netdb.RequestDestination (*m_DestinationIdentHash, true, GetLocalDestination ()->GetTunnelPool ());
|
||||||
m_Timer.expires_from_now (boost::posix_time::seconds (I2P_TUNNEL_DESTINATION_REQUEST_TIMEOUT));
|
m_Timer.expires_from_now (boost::posix_time::seconds (I2P_TUNNEL_DESTINATION_REQUEST_TIMEOUT));
|
||||||
m_Timer.async_wait (boost::bind (&I2PClientTunnel::HandleDestinationRequestTimer,
|
m_Timer.async_wait (std::bind (&I2PClientTunnel::HandleDestinationRequestTimer,
|
||||||
this, boost::asio::placeholders::error, socket));
|
this, std::placeholders::_1, socket));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
@ -240,8 +239,9 @@ namespace client
|
|||||||
if (m_RemoteLeaseSet) // leaseSet found
|
if (m_RemoteLeaseSet) // leaseSet found
|
||||||
{
|
{
|
||||||
LogPrint ("New I2PTunnel connection");
|
LogPrint ("New I2PTunnel connection");
|
||||||
auto connection = new I2PTunnelConnection (this, socket, m_RemoteLeaseSet);
|
auto connection = std::make_shared<I2PTunnelConnection>(this, socket, m_RemoteLeaseSet);
|
||||||
AddConnection (connection);
|
AddConnection (connection);
|
||||||
|
connection->I2PConnect ();
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
@ -278,7 +278,11 @@ namespace client
|
|||||||
void I2PServerTunnel::HandleAccept (std::shared_ptr<i2p::stream::Stream> stream)
|
void I2PServerTunnel::HandleAccept (std::shared_ptr<i2p::stream::Stream> stream)
|
||||||
{
|
{
|
||||||
if (stream)
|
if (stream)
|
||||||
new I2PTunnelConnection (this, stream, new boost::asio::ip::tcp::socket (GetService ()), m_Endpoint);
|
{
|
||||||
|
auto conn = std::make_shared<I2PTunnelConnection> (this, stream, new boost::asio::ip::tcp::socket (GetService ()), m_Endpoint);
|
||||||
|
AddConnection (conn);
|
||||||
|
conn->Connect ();
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
12
I2PTunnel.h
12
I2PTunnel.h
@ -19,7 +19,7 @@ namespace client
|
|||||||
const int I2P_TUNNEL_DESTINATION_REQUEST_TIMEOUT = 10; // in seconds
|
const int I2P_TUNNEL_DESTINATION_REQUEST_TIMEOUT = 10; // in seconds
|
||||||
|
|
||||||
class I2PTunnel;
|
class I2PTunnel;
|
||||||
class I2PTunnelConnection
|
class I2PTunnelConnection: public std::enable_shared_from_this<I2PTunnelConnection>
|
||||||
{
|
{
|
||||||
public:
|
public:
|
||||||
|
|
||||||
@ -29,6 +29,9 @@ namespace client
|
|||||||
const boost::asio::ip::tcp::endpoint& target);
|
const boost::asio::ip::tcp::endpoint& target);
|
||||||
~I2PTunnelConnection ();
|
~I2PTunnelConnection ();
|
||||||
|
|
||||||
|
void I2PConnect ();
|
||||||
|
void Connect ();
|
||||||
|
|
||||||
private:
|
private:
|
||||||
|
|
||||||
void Terminate ();
|
void Terminate ();
|
||||||
@ -47,6 +50,7 @@ namespace client
|
|||||||
boost::asio::ip::tcp::socket * m_Socket;
|
boost::asio::ip::tcp::socket * m_Socket;
|
||||||
std::shared_ptr<i2p::stream::Stream> m_Stream;
|
std::shared_ptr<i2p::stream::Stream> m_Stream;
|
||||||
I2PTunnel * m_Owner;
|
I2PTunnel * m_Owner;
|
||||||
|
boost::asio::ip::tcp::endpoint m_RemoteEndpoint;
|
||||||
};
|
};
|
||||||
|
|
||||||
class I2PTunnel
|
class I2PTunnel
|
||||||
@ -57,8 +61,8 @@ namespace client
|
|||||||
m_Service (service), m_LocalDestination (localDestination) {};
|
m_Service (service), m_LocalDestination (localDestination) {};
|
||||||
virtual ~I2PTunnel () { ClearConnections (); };
|
virtual ~I2PTunnel () { ClearConnections (); };
|
||||||
|
|
||||||
void AddConnection (I2PTunnelConnection * conn);
|
void AddConnection (std::shared_ptr<I2PTunnelConnection> conn);
|
||||||
void RemoveConnection (I2PTunnelConnection * conn);
|
void RemoveConnection (std::shared_ptr<I2PTunnelConnection> conn);
|
||||||
void ClearConnections ();
|
void ClearConnections ();
|
||||||
ClientDestination * GetLocalDestination () { return m_LocalDestination; };
|
ClientDestination * GetLocalDestination () { return m_LocalDestination; };
|
||||||
void SetLocalDestination (ClientDestination * dest) { m_LocalDestination = dest; };
|
void SetLocalDestination (ClientDestination * dest) { m_LocalDestination = dest; };
|
||||||
@ -69,7 +73,7 @@ namespace client
|
|||||||
|
|
||||||
boost::asio::io_service& m_Service;
|
boost::asio::io_service& m_Service;
|
||||||
ClientDestination * m_LocalDestination;
|
ClientDestination * m_LocalDestination;
|
||||||
std::set<I2PTunnelConnection *> m_Connections;
|
std::set<std::shared_ptr<I2PTunnelConnection> > m_Connections;
|
||||||
};
|
};
|
||||||
|
|
||||||
class I2PClientTunnel: public I2PTunnel
|
class I2PClientTunnel: public I2PTunnel
|
||||||
|
Loading…
x
Reference in New Issue
Block a user