diff --git a/encryption/libtorrent/include/libtorrent/http_stream.hpp b/encryption/libtorrent/include/libtorrent/http_stream.hpp index 2bd124b43..75c7bf57b 100644 --- a/encryption/libtorrent/include/libtorrent/http_stream.hpp +++ b/encryption/libtorrent/include/libtorrent/http_stream.hpp @@ -1,15 +1,9 @@ -#include "libtorrent/io.hpp" -#include "libtorrent/socket.hpp" -#include -#include -#include -#include -#include - +#ifndef TORRENT_HTTP_STREAM_HPP_INCLUDED +#define TORRENT_HTTP_STREAM_HPP_INCLUDED +#include "libtorrent/proxy_base.hpp" namespace libtorrent { - -class http_stream : boost::noncopyable +class http_stream : public proxy_base { public: @@ -18,19 +12,12 @@ public: typedef stream_socket::protocol_type protocol_type; explicit http_stream(asio::io_service& io_service) - : m_sock(io_service) - , m_resolver(io_service) + : proxy_base(io_service) , m_no_connect(false) {} void set_no_connect(bool c) { m_no_connect = c; } - void set_proxy(std::string hostname, int port) - { - m_hostname = hostname; - m_port = port; - } - void set_username(std::string const& user , std::string const& password) { @@ -38,108 +25,6 @@ public: m_password = password; } - template - void async_read_some(Mutable_Buffers const& buffers, Handler const& handler) - { - m_sock.async_read_some(buffers, handler); - } - - template - std::size_t read_some(Mutable_Buffers const& buffers, asio::error_code& ec) - { - return m_sock.read_some(buffers, ec); - } - - template - std::size_t read_some(Mutable_Buffers const& buffers) - { - return m_sock.read_some(buffers); - } - - template - void io_control(IO_Control_Command& ioc) - { - m_sock.io_control(ioc); - } - - template - void io_control(IO_Control_Command& ioc, asio::error_code& ec) - { - m_sock.io_control(ioc, ec); - } - - template - void async_write_some(Const_Buffers const& buffers, Handler const& handler) - { - m_sock.async_write_some(buffers, handler); - } - - void bind(endpoint_type const& endpoint) - { - m_sock.bind(endpoint); - } - - template - void bind(endpoint_type const& endpoint, Error_Handler const& error_handler) - { - m_sock.bind(endpoint, error_handler); - } - - void open(protocol_type const& p) - { - m_sock.open(p); - } - - template - void open(protocol_type const& p, Error_Handler const& error_handler) - { - m_sock.open(p, error_handler); - } - - void close() - { - m_remote_endpoint = endpoint_type(); - m_sock.close(); - } - - template - void close(Error_Handler const& error_handler) - { - m_sock.close(error_handler); - } - - endpoint_type remote_endpoint() - { - return m_remote_endpoint; - } - - template - endpoint_type remote_endpoint(Error_Handler const& error_handler) - { - return m_remote_endpoint; - } - - endpoint_type local_endpoint() - { - return m_sock.local_endpoint(); - } - - template - endpoint_type local_endpoint(Error_Handler const& error_handler) - { - return m_sock.local_endpoint(error_handler); - } - - asio::io_service& io_service() - { - return m_sock.io_service(); - } - - lowest_layer_type& lowest_layer() - { - return m_sock.lowest_layer(); - } - typedef boost::function handler_type; template @@ -171,19 +56,12 @@ private: void handshake1(asio::error_code const& e, boost::shared_ptr h); void handshake2(asio::error_code const& e, boost::shared_ptr h); - stream_socket m_sock; - // the http proxy - std::string m_hostname; - int m_port; // send and receive buffer std::vector m_buffer; // proxy authentication std::string m_user; std::string m_password; - endpoint_type m_remote_endpoint; - - tcp::resolver m_resolver; // this is true if the connection is HTTP based and // want to talk directly to the proxy bool m_no_connect; @@ -191,3 +69,4 @@ private: } +#endif