diff options
Diffstat (limited to 'libtransport/src/hicn/transport/http')
6 files changed, 3 insertions, 9 deletions
diff --git a/libtransport/src/hicn/transport/http/client_connection.cc b/libtransport/src/hicn/transport/http/client_connection.cc index fb7dbdfac..fadf0ae44 100644 --- a/libtransport/src/hicn/transport/http/client_connection.cc +++ b/libtransport/src/hicn/transport/http/client_connection.cc @@ -26,7 +26,7 @@ namespace http { using namespace transport; HTTPClientConnection::HTTPClientConnection() - : consumer_(TransportProtocolAlgorithms::RAAQM, io_service_), + : consumer_(TransportProtocolAlgorithms::RAAQM), read_bytes_callback_(nullptr), read_buffer_(nullptr), response_(std::make_shared<HTTPResponse>()), diff --git a/libtransport/src/hicn/transport/http/client_connection.h b/libtransport/src/hicn/transport/http/client_connection.h index 6c150f848..d0624702f 100644 --- a/libtransport/src/hicn/transport/http/client_connection.h +++ b/libtransport/src/hicn/transport/http/client_connection.h @@ -88,8 +88,6 @@ class HTTPClientConnection : public ConsumerSocket::ReadCallback { void readError(const std::error_code ec) noexcept override; void readSuccess(std::size_t total_size) noexcept override; - asio::io_service io_service_; - // The consumer socket ConsumerSocket consumer_; diff --git a/libtransport/src/hicn/transport/http/server_acceptor.cc b/libtransport/src/hicn/transport/http/server_acceptor.cc index 486b04c57..e478dfcd4 100644 --- a/libtransport/src/hicn/transport/http/server_acceptor.cc +++ b/libtransport/src/hicn/transport/http/server_acceptor.cc @@ -63,9 +63,7 @@ HTTPServerAcceptor::HTTPServerAcceptor(std::string &server_locator, core::Prefix acceptor_namespace(network, 64); std::string producer_identity = "acceptor_producer"; - acceptor_producer_ = std::make_shared<ProducerSocket>( - io_service_); /*, - utils::Identity::generateIdentity(producer_identity));*/ + acceptor_producer_ = std::make_shared<ProducerSocket>(); acceptor_producer_->registerPrefix(acceptor_namespace); } diff --git a/libtransport/src/hicn/transport/http/server_acceptor.h b/libtransport/src/hicn/transport/http/server_acceptor.h index 4e7350b76..6ed58f70e 100644 --- a/libtransport/src/hicn/transport/http/server_acceptor.h +++ b/libtransport/src/hicn/transport/http/server_acceptor.h @@ -53,7 +53,6 @@ class HTTPServerAcceptor { void processIncomingInterest(ProducerSocket &p, Interest &interest); OnHttpRequest callback_; - asio::io_service io_service_; std::shared_ptr<ProducerSocket> acceptor_producer_; std::map<int, std::shared_ptr<HTTPServerPublisher>> publishers_; diff --git a/libtransport/src/hicn/transport/http/server_publisher.cc b/libtransport/src/hicn/transport/http/server_publisher.cc index 012f36091..6a4bb9c48 100644 --- a/libtransport/src/hicn/transport/http/server_publisher.cc +++ b/libtransport/src/hicn/transport/http/server_publisher.cc @@ -23,7 +23,7 @@ namespace http { HTTPServerPublisher::HTTPServerPublisher(const core::Name &content_name) : content_name_(content_name, true) { std::string identity = "acceptor_producer"; - producer_ = std::make_unique<ProducerSocket>(io_service_); + producer_ = std::make_unique<ProducerSocket>(); // utils::Identity::generateIdentity(identity)); core::Prefix publisher_prefix(content_name_, 128); producer_->registerPrefix(publisher_prefix); diff --git a/libtransport/src/hicn/transport/http/server_publisher.h b/libtransport/src/hicn/transport/http/server_publisher.h index 1f12fd8f9..33d596f63 100644 --- a/libtransport/src/hicn/transport/http/server_publisher.h +++ b/libtransport/src/hicn/transport/http/server_publisher.h @@ -59,7 +59,6 @@ class HTTPServerPublisher { private: Name content_name_; std::unique_ptr<asio::steady_timer> timer_; - asio::io_service io_service_; std::unique_ptr<ProducerSocket> producer_; ProducerInterestCallback interest_enter_callback_; utils::UserCallback wait_callback_; |