Skip to content
/ i2pd Public
forked from PurpleI2P/i2pd

Commit

Permalink
send X-I2P-DestHash
Browse files Browse the repository at this point in the history
  • Loading branch information
orignal committed Jan 11, 2016
1 parent 258be40 commit 7968279
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 2 deletions.
8 changes: 7 additions & 1 deletion I2PTunnel.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -165,7 +165,7 @@ namespace client
I2PTunnelConnectionHTTP::I2PTunnelConnectionHTTP (I2PService * owner, std::shared_ptr<i2p::stream::Stream> stream,
std::shared_ptr<boost::asio::ip::tcp::socket> socket,
const boost::asio::ip::tcp::endpoint& target, const std::string& host):
I2PTunnelConnection (owner, stream, socket, target), m_Host (host), m_HeaderSent (false)
I2PTunnelConnection (owner, stream, socket, target), m_Host (host), m_HeaderSent (false), m_From (stream->GetRemoteIdentity ())
{
}

Expand Down Expand Up @@ -193,6 +193,12 @@ namespace client
else
break;
}
// add X-I2P fields
if (m_From)
{
m_OutHeader << X_I2P_DEST_HASH << ": " << m_From->GetIdentHash ().ToBase64 () << "\r\n";
// m_OutHeader << X_I2P_DEST_B64 << ": " << m_From->ToBase64 () << "\r\n";
}

if (endOfHeader)
{
Expand Down
6 changes: 5 additions & 1 deletion I2PTunnel.h
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,10 @@ namespace client
const size_t I2P_TUNNEL_CONNECTION_BUFFER_SIZE = 8192;
const int I2P_TUNNEL_CONNECTION_MAX_IDLE = 3600; // in seconds
const int I2P_TUNNEL_DESTINATION_REQUEST_TIMEOUT = 10; // in seconds

// for HTTP tunnels
const char X_I2P_DEST_HASH[] = "X-I2P-DestHash"; // hash in base64
//const char X_I2P_DEST_B64[] = "X-I2P-DestB64"; // full address in base64
//const char X_I2P_DEST_B32[] = "X-I2P-DestB32"; // full address in base32

class I2PTunnelConnection: public I2PServiceHandler, public std::enable_shared_from_this<I2PTunnelConnection>
{
Expand Down Expand Up @@ -74,6 +77,7 @@ namespace client
std::string m_Host;
std::stringstream m_InHeader, m_OutHeader;
bool m_HeaderSent;
std::shared_ptr<const i2p::data::IdentityEx> m_From;
};

class I2PClientTunnel: public TCPIPAcceptor
Expand Down

0 comments on commit 7968279

Please sign in to comment.