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

Migrate to I2Pservice

Browse Source
This commit is contained in:
Francisco Blas (klondike) Izquierdo Riera 2015-01-07 20:44:24 +01:00
parent dd42819a2f
commit 90005c8237
6 changed files with 18 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
Destination.cpp
View File

@ -387,18 +387,6 @@ namespace client
} }
} }
void ClientDestination::CreateStream (StreamRequestComplete streamRequestComplete, const std::string& dest, int port) {
assert(streamRequestComplete);
i2p::data::IdentHash identHash;
if (i2p::client::context.GetAddressBook ().GetIdentHash (dest, identHash))
CreateStream (streamRequestComplete, identHash, port);
else
{
LogPrint (eLogWarning, "Remote destination ", dest, " not found");
streamRequestComplete (nullptr);
}
}
void ClientDestination::CreateStream (StreamRequestComplete streamRequestComplete, const i2p::data::IdentHash& dest, int port) { void ClientDestination::CreateStream (StreamRequestComplete streamRequestComplete, const i2p::data::IdentHash& dest, int port) {
assert(streamRequestComplete); assert(streamRequestComplete);
const i2p::data::LeaseSet * leaseSet = FindLeaseSet (dest); const i2p::data::LeaseSet * leaseSet = FindLeaseSet (dest);

6
Destination.h
View File

@ -36,7 +36,9 @@ namespace client
const char I2CP_PARAM_OUTBOUND_TUNNEL_LENGTH[] = "outbound.length"; const char I2CP_PARAM_OUTBOUND_TUNNEL_LENGTH[] = "outbound.length";
const int DEFAULT_OUTBOUND_TUNNEL_LENGTH = 3; const int DEFAULT_OUTBOUND_TUNNEL_LENGTH = 3;
const int STREAM_REQUEST_TIMEOUT = 60; //in seconds const int STREAM_REQUEST_TIMEOUT = 60; //in seconds
typedef std::function<void (std::shared_ptr<i2p::stream::Stream> stream)> StreamRequestComplete;
class ClientDestination: public i2p::garlic::GarlicDestination class ClientDestination: public i2p::garlic::GarlicDestination
{ {
typedef std::function<void (bool success)> RequestComplete; typedef std::function<void (bool success)> RequestComplete;
@ -49,7 +51,6 @@ namespace client
RequestComplete requestComplete; RequestComplete requestComplete;
}; };
typedef std::function<void (std::shared_ptr<i2p::stream::Stream> stream)> StreamRequestComplete;
public: public:
@ -67,7 +68,6 @@ namespace client
// streaming // streaming
i2p::stream::StreamingDestination * GetStreamingDestination () const { return m_StreamingDestination; }; i2p::stream::StreamingDestination * GetStreamingDestination () const { return m_StreamingDestination; };
void CreateStream (StreamRequestComplete streamRequestComplete, const std::string& dest, int port = 0);
void CreateStream (StreamRequestComplete streamRequestComplete, const i2p::data::IdentHash& dest, int port = 0); void CreateStream (StreamRequestComplete streamRequestComplete, const i2p::data::IdentHash& dest, int port = 0);
std::shared_ptr<i2p::stream::Stream> CreateStream (const i2p::data::LeaseSet& remote, int port = 0); std::shared_ptr<i2p::stream::Stream> CreateStream (const i2p::data::LeaseSet& remote, int port = 0);
void AcceptStreams (const i2p::stream::StreamingDestination::Acceptor& acceptor); void AcceptStreams (const i2p::stream::StreamingDestination::Acceptor& acceptor);

3
HTTPProxy.cpp
View File

@ -196,8 +196,7 @@ namespace proxy
if (HandleData(m_http_buff, len)) { if (HandleData(m_http_buff, len)) {
if (m_state == DONE) { if (m_state == DONE) {
LogPrint(eLogInfo,"--- HTTP Proxy requested: ", m_url); LogPrint(eLogInfo,"--- HTTP Proxy requested: ", m_url);
GetOwner()->GetLocalDestination ()->CreateStream ( GetOwner()->CreateStream (std::bind (&HTTPProxyHandler::HandleStreamRequestComplete,
std::bind (&HTTPProxyHandler::HandleStreamRequestComplete,
this, std::placeholders::_1), m_address, m_port); this, std::placeholders::_1), m_address, m_port);
} else { } else {
AsyncSockRead(); AsyncSockRead();

12
I2PService.cpp
View File

@ -15,5 +15,17 @@ namespace client
i2p::client::context.CreateNewLocalDestination (false, I2P_SERVICE_DEFAULT_KEY_TYPE)) i2p::client::context.CreateNewLocalDestination (false, I2P_SERVICE_DEFAULT_KEY_TYPE))
{ {
} }
void ClientDestination::CreateStream (StreamRequestComplete streamRequestComplete, const std::string& dest, int port) {
assert(streamRequestComplete);
i2p::data::IdentHash identHash;
if (i2p::client::context.GetAddressBook ().GetIdentHash (dest, identHash))
localDestination->CreateStream (streamRequestComplete, identHash, port);
else
{
LogPrint (eLogWarning, "Remote destination ", dest, " not found");
streamRequestComplete (nullptr);
}
}
} }
} }

1
I2PService.h
View File

@ -35,6 +35,7 @@ namespace client
inline ClientDestination * GetLocalDestination () { return m_LocalDestination; }; inline ClientDestination * GetLocalDestination () { return m_LocalDestination; };
inline void SetLocalDestination (ClientDestination * dest) { m_LocalDestination = dest; }; inline void SetLocalDestination (ClientDestination * dest) { m_LocalDestination = dest; };
void CreateStream (StreamRequestComplete streamRequestComplete, const std::string& dest, int port = 0);
inline boost::asio::io_service& GetService () { return m_LocalDestination->GetService (); }; inline boost::asio::io_service& GetService () { return m_LocalDestination->GetService (); };

3
SOCKS.cpp
View File

@ -454,8 +454,7 @@ namespace proxy
if (HandleData(m_sock_buff, len)) { if (HandleData(m_sock_buff, len)) {
if (m_state == DONE) { if (m_state == DONE) {
LogPrint(eLogInfo,"--- SOCKS requested ", m_address.dns.ToString(), ":" , m_port); LogPrint(eLogInfo,"--- SOCKS requested ", m_address.dns.ToString(), ":" , m_port);
GetOwner()->GetLocalDestination ()->CreateStream ( GetOwner()->CreateStream ( std::bind (&SOCKSHandler::HandleStreamRequestComplete,
std::bind (&SOCKSHandler::HandleStreamRequestComplete,
this, std::placeholders::_1), m_address.dns.ToString(), m_port); this, std::placeholders::_1), m_address.dns.ToString(), m_port);
} else { } else {
AsyncSockRead(); AsyncSockRead();