mirror of
https://github.com/PurpleI2P/i2pd.git
synced 2025-04-23 17:36:37 +02:00
Get rid of old HTTPServer proxy functionality.
This commit is contained in:
EinMByte
parent
c3685927d2
commit
6ed48ab876
2 changed files with 7 additions and 129 deletions
123
HTTPServer.cpp
123
HTTPServer.cpp
|
|
@ -538,17 +538,10 @@ namespace util
|
||||||
|
|
||||||
void HTTPConnection::HandleReceive (const boost::system::error_code& ecode, std::size_t bytes_transferred)
|
void HTTPConnection::HandleReceive (const boost::system::error_code& ecode, std::size_t bytes_transferred)
|
||||||
{
|
{
|
||||||
if (!ecode)
|
if(!ecode) {
|
||||||
{
|
m_Buffer[bytes_transferred] = 0;
|
||||||
if (!m_Stream) // new request
|
m_BufferLen = bytes_transferred;
|
||||||
{
|
RunRequest();
|
||||||
m_Buffer[bytes_transferred] = 0;
|
|
||||||
m_BufferLen = bytes_transferred;
|
|
||||||
RunRequest();
|
|
||||||
}
|
|
||||||
else // follow-on
|
|
||||||
m_Stream->Send ((uint8_t *)m_Buffer, bytes_transferred);
|
|
||||||
Receive ();
|
|
||||||
}
|
}
|
||||||
else if (ecode != boost::asio::error::operation_aborted)
|
else if (ecode != boost::asio::error::operation_aborted)
|
||||||
Terminate ();
|
Terminate ();
|
||||||
|
|
@ -558,21 +551,9 @@ namespace util
|
||||||
{
|
{
|
||||||
auto address = ExtractAddress ();
|
auto address = ExtractAddress ();
|
||||||
if (address.length () > 1 && address[1] != '?') // not just '/' or '/?'
|
if (address.length () > 1 && address[1] != '?') // not just '/' or '/?'
|
||||||
{
|
return; // TODO: error handling
|
||||||
std::string uri ("/"), b32;
|
|
||||||
size_t pos = address.find ('/', 1);
|
|
||||||
if (pos == std::string::npos)
|
|
||||||
b32 = address.substr (1); // excluding leading '/' to end of line
|
|
||||||
else
|
|
||||||
{
|
|
||||||
b32 = address.substr (1, pos - 1); // excluding leading '/' to next '/'
|
|
||||||
uri = address.substr (pos); // rest of line
|
|
||||||
}
|
|
||||||
|
|
||||||
HandleDestinationRequest (b32, uri);
|
HandleRequest (address);
|
||||||
}
|
|
||||||
else
|
|
||||||
HandleRequest (address);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
std::string HTTPConnection::ExtractAddress ()
|
std::string HTTPConnection::ExtractAddress ()
|
||||||
|
|
@ -614,17 +595,6 @@ namespace util
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
void HTTPConnection::HandleWrite (const boost::system::error_code& ecode)
|
|
||||||
{
|
|
||||||
if (ecode || (m_Stream && !m_Stream->IsOpen ()))
|
|
||||||
{
|
|
||||||
if (ecode != boost::asio::error::operation_aborted)
|
|
||||||
Terminate ();
|
|
||||||
}
|
|
||||||
else // data keeps coming
|
|
||||||
AsyncStreamReceive ();
|
|
||||||
}
|
|
||||||
|
|
||||||
void HTTPConnection::HandleRequest (const std::string& address)
|
void HTTPConnection::HandleRequest (const std::string& address)
|
||||||
{
|
{
|
||||||
std::stringstream s;
|
std::stringstream s;
|
||||||
|
|
@ -948,87 +918,6 @@ namespace util
|
||||||
s << "Accepting tunnels stopped" << std::endl;
|
s << "Accepting tunnels stopped" << std::endl;
|
||||||
}
|
}
|
||||||
|
|
||||||
void HTTPConnection::HandleDestinationRequest (const std::string& address, const std::string& uri)
|
|
||||||
{
|
|
||||||
std::string request = "GET " + uri + " HTTP/1.1\r\nHost:" + address + "\r\n";
|
|
||||||
LogPrint("HTTP Client Request: ", request);
|
|
||||||
SendToAddress (address, 80, request.c_str (), request.size ());
|
|
||||||
}
|
|
||||||
|
|
||||||
void HTTPConnection::SendToAddress (const std::string& address, int port, const char * buf, size_t len)
|
|
||||||
{
|
|
||||||
i2p::data::IdentHash destination;
|
|
||||||
if (!i2p::client::context.GetAddressBook ().GetIdentHash (address, destination))
|
|
||||||
{
|
|
||||||
LogPrint ("Unknown address ", address);
|
|
||||||
SendReply ("<html>" + itoopieImage + "<br>Unknown address " + address + "</html>", 404);
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
auto leaseSet = i2p::client::context.GetSharedLocalDestination ()->FindLeaseSet (destination);
|
|
||||||
if (leaseSet && leaseSet->HasNonExpiredLeases ())
|
|
||||||
SendToDestination (leaseSet, port, buf, len);
|
|
||||||
else
|
|
||||||
{
|
|
||||||
memcpy (m_Buffer, buf, len);
|
|
||||||
m_BufferLen = len;
|
|
||||||
i2p::client::context.GetSharedLocalDestination ()->RequestDestination (destination);
|
|
||||||
m_Timer.expires_from_now (boost::posix_time::seconds(HTTP_DESTINATION_REQUEST_TIMEOUT));
|
|
||||||
m_Timer.async_wait (std::bind (&HTTPConnection::HandleDestinationRequestTimeout,
|
|
||||||
shared_from_this (), std::placeholders::_1, destination, port, m_Buffer, m_BufferLen));
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
void HTTPConnection::HandleDestinationRequestTimeout (const boost::system::error_code& ecode,
|
|
||||||
i2p::data::IdentHash destination, int port, const char * buf, size_t len)
|
|
||||||
{
|
|
||||||
if (ecode != boost::asio::error::operation_aborted)
|
|
||||||
{
|
|
||||||
auto leaseSet = i2p::client::context.GetSharedLocalDestination ()->FindLeaseSet (destination);
|
|
||||||
if (leaseSet && leaseSet->HasNonExpiredLeases ())
|
|
||||||
SendToDestination (leaseSet, port, buf, len);
|
|
||||||
else
|
|
||||||
// still no LeaseSet
|
|
||||||
SendReply (leaseSet ? "<html>" + itoopieImage + "<br>Leases expired</html>" : "<html>" + itoopieImage + "LeaseSet not found</html>", 504);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
void HTTPConnection::SendToDestination (std::shared_ptr<const i2p::data::LeaseSet> remote, int port, const char * buf, size_t len)
|
|
||||||
{
|
|
||||||
if (!m_Stream)
|
|
||||||
m_Stream = i2p::client::context.GetSharedLocalDestination ()->CreateStream (remote, port);
|
|
||||||
if (m_Stream)
|
|
||||||
{
|
|
||||||
m_Stream->Send ((uint8_t *)buf, len);
|
|
||||||
AsyncStreamReceive ();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
void HTTPConnection::AsyncStreamReceive ()
|
|
||||||
{
|
|
||||||
if (m_Stream)
|
|
||||||
m_Stream->AsyncReceive (boost::asio::buffer (m_StreamBuffer, 8192),
|
|
||||||
std::bind (&HTTPConnection::HandleStreamReceive, shared_from_this (),
|
|
||||||
std::placeholders::_1, std::placeholders::_2),
|
|
||||||
45); // 45 seconds timeout
|
|
||||||
}
|
|
||||||
|
|
||||||
void HTTPConnection::HandleStreamReceive (const boost::system::error_code& ecode, std::size_t bytes_transferred)
|
|
||||||
{
|
|
||||||
if (!ecode)
|
|
||||||
{
|
|
||||||
boost::asio::async_write (*m_Socket, boost::asio::buffer (m_StreamBuffer, bytes_transferred),
|
|
||||||
std::bind (&HTTPConnection::HandleWrite, shared_from_this (), std::placeholders::_1));
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
if (ecode == boost::asio::error::timed_out)
|
|
||||||
SendReply ("<html>" + itoopieImage + "<br>Not responding</html>", 504);
|
|
||||||
else if (ecode != boost::asio::error::operation_aborted)
|
|
||||||
Terminate ();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
void HTTPConnection::SendReply (const std::string& content, int status)
|
void HTTPConnection::SendReply (const std::string& content, int status)
|
||||||
{
|
{
|
||||||
m_Reply.content = content;
|
m_Reply.content = content;
|
||||||
|
|
|
||||||
13
HTTPServer.h
13
HTTPServer.h
|
|
@ -6,8 +6,6 @@
|
||||||
#include <memory>
|
#include <memory>
|
||||||
#include <boost/asio.hpp>
|
#include <boost/asio.hpp>
|
||||||
#include <boost/array.hpp>
|
#include <boost/array.hpp>
|
||||||
#include "LeaseSet.h"
|
|
||||||
#include "Streaming.h"
|
|
||||||
|
|
||||||
namespace i2p
|
namespace i2p
|
||||||
{
|
{
|
||||||
|
|
@ -48,7 +46,7 @@ namespace util
|
||||||
|
|
||||||
HTTPConnection (boost::asio::ip::tcp::socket * socket):
|
HTTPConnection (boost::asio::ip::tcp::socket * socket):
|
||||||
m_Socket (socket), m_Timer (socket->get_io_service ()),
|
m_Socket (socket), m_Timer (socket->get_io_service ()),
|
||||||
m_Stream (nullptr), m_BufferLen (0) {};
|
m_BufferLen (0) {};
|
||||||
~HTTPConnection() { delete m_Socket; }
|
~HTTPConnection() { delete m_Socket; }
|
||||||
void Receive ();
|
void Receive ();
|
||||||
|
|
||||||
|
|
@ -56,10 +54,7 @@ namespace util
|
||||||
|
|
||||||
void Terminate ();
|
void Terminate ();
|
||||||
void HandleReceive (const boost::system::error_code& ecode, std::size_t bytes_transferred);
|
void HandleReceive (const boost::system::error_code& ecode, std::size_t bytes_transferred);
|
||||||
void AsyncStreamReceive ();
|
|
||||||
void HandleStreamReceive (const boost::system::error_code& ecode, std::size_t bytes_transferred);
|
|
||||||
void HandleWriteReply(const boost::system::error_code& ecode);
|
void HandleWriteReply(const boost::system::error_code& ecode);
|
||||||
void HandleWrite (const boost::system::error_code& ecode);
|
|
||||||
void SendReply (const std::string& content, int status = 200);
|
void SendReply (const std::string& content, int status = 200);
|
||||||
|
|
||||||
void HandleRequest (const std::string& address);
|
void HandleRequest (const std::string& address);
|
||||||
|
|
@ -82,7 +77,6 @@ namespace util
|
||||||
|
|
||||||
boost::asio::ip::tcp::socket * m_Socket;
|
boost::asio::ip::tcp::socket * m_Socket;
|
||||||
boost::asio::deadline_timer m_Timer;
|
boost::asio::deadline_timer m_Timer;
|
||||||
std::shared_ptr<i2p::stream::Stream> m_Stream;
|
|
||||||
char m_Buffer[HTTP_CONNECTION_BUFFER_SIZE + 1], m_StreamBuffer[HTTP_CONNECTION_BUFFER_SIZE + 1];
|
char m_Buffer[HTTP_CONNECTION_BUFFER_SIZE + 1], m_StreamBuffer[HTTP_CONNECTION_BUFFER_SIZE + 1];
|
||||||
size_t m_BufferLen;
|
size_t m_BufferLen;
|
||||||
request m_Request;
|
request m_Request;
|
||||||
|
|
@ -91,11 +85,6 @@ namespace util
|
||||||
protected:
|
protected:
|
||||||
|
|
||||||
virtual void RunRequest ();
|
virtual void RunRequest ();
|
||||||
void HandleDestinationRequest(const std::string& address, const std::string& uri);
|
|
||||||
void SendToAddress (const std::string& address, int port, const char * buf, size_t len);
|
|
||||||
void HandleDestinationRequestTimeout (const boost::system::error_code& ecode,
|
|
||||||
i2p::data::IdentHash destination, int port, const char * buf, size_t len);
|
|
||||||
void SendToDestination (std::shared_ptr<const i2p::data::LeaseSet> remote, int port, const char * buf, size_t len);
|
|
||||||
|
|
||||||
public:
|
public:
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Add table
Reference in a new issue