From e5145b878f9de35676085409878a66899d2ee4f2 Mon Sep 17 00:00:00 2001 From: Angelo Mantellini Date: Wed, 30 Jan 2019 12:11:34 +0100 Subject: [HICN-18] first commit of libtransport for windows Change-Id: I3a43b22194aa13ae5de1746e3d4bd9a275070261 Signed-off-by: Angelo Mantellini --- .../src/hicn/transport/interfaces/CMakeLists.txt | 0 .../src/hicn/transport/interfaces/async_transport.h | 3 +++ .../hicn/transport/interfaces/full_duplex_socket.cc | 20 +++++++++++--------- .../hicn/transport/interfaces/full_duplex_socket.h | 0 .../hicn/transport/interfaces/publication_options.h | 0 .../hicn/transport/interfaces/rtc_socket_consumer.cc | 3 +-- .../hicn/transport/interfaces/rtc_socket_consumer.h | 0 .../hicn/transport/interfaces/rtc_socket_producer.cc | 1 - .../hicn/transport/interfaces/rtc_socket_producer.h | 0 libtransport/src/hicn/transport/interfaces/socket.h | 0 .../src/hicn/transport/interfaces/socket_consumer.h | 0 .../interfaces/socket_options_default_values.h | 0 .../hicn/transport/interfaces/socket_options_keys.h | 0 .../src/hicn/transport/interfaces/socket_producer.cc | 5 +---- .../src/hicn/transport/interfaces/socket_producer.h | 0 15 files changed, 16 insertions(+), 16 deletions(-) mode change 100755 => 100644 libtransport/src/hicn/transport/interfaces/CMakeLists.txt mode change 100755 => 100644 libtransport/src/hicn/transport/interfaces/async_transport.h mode change 100755 => 100644 libtransport/src/hicn/transport/interfaces/full_duplex_socket.h mode change 100755 => 100644 libtransport/src/hicn/transport/interfaces/publication_options.h mode change 100755 => 100644 libtransport/src/hicn/transport/interfaces/rtc_socket_consumer.cc mode change 100755 => 100644 libtransport/src/hicn/transport/interfaces/rtc_socket_consumer.h mode change 100755 => 100644 libtransport/src/hicn/transport/interfaces/rtc_socket_producer.h mode change 100755 => 100644 libtransport/src/hicn/transport/interfaces/socket.h mode change 100755 => 100644 libtransport/src/hicn/transport/interfaces/socket_consumer.h mode change 100755 => 100644 libtransport/src/hicn/transport/interfaces/socket_options_default_values.h mode change 100755 => 100644 libtransport/src/hicn/transport/interfaces/socket_options_keys.h mode change 100755 => 100644 libtransport/src/hicn/transport/interfaces/socket_producer.cc mode change 100755 => 100644 libtransport/src/hicn/transport/interfaces/socket_producer.h (limited to 'libtransport/src/hicn/transport/interfaces') diff --git a/libtransport/src/hicn/transport/interfaces/CMakeLists.txt b/libtransport/src/hicn/transport/interfaces/CMakeLists.txt old mode 100755 new mode 100644 diff --git a/libtransport/src/hicn/transport/interfaces/async_transport.h b/libtransport/src/hicn/transport/interfaces/async_transport.h old mode 100755 new mode 100644 index 492b4ec26..2911377a4 --- a/libtransport/src/hicn/transport/interfaces/async_transport.h +++ b/libtransport/src/hicn/transport/interfaces/async_transport.h @@ -20,7 +20,10 @@ #include #include +#ifndef _WIN32 #include +#endif + #include namespace transport { diff --git a/libtransport/src/hicn/transport/interfaces/full_duplex_socket.cc b/libtransport/src/hicn/transport/interfaces/full_duplex_socket.cc index e06858cc3..0a091d94e 100644 --- a/libtransport/src/hicn/transport/interfaces/full_duplex_socket.cc +++ b/libtransport/src/hicn/transport/interfaces/full_duplex_socket.cc @@ -57,21 +57,23 @@ AsyncFullDuplexSocket::AsyncFullDuplexSocket(const Prefix &locator, producer_->setSocketOption(GeneralTransportOptions::OUTPUT_BUFFER_SIZE, uint32_t{150000}); - producer_->setSocketOption( - ProducerCallbacksOptions::CONTENT_PRODUCED, - std::bind(&AsyncFullDuplexSocket::onContentProduced, this, _1, _2, _3)); + ProducerContentCallback producer_callback = + std::bind(&AsyncFullDuplexSocket::onContentProduced, this, _1, _2, _3); + producer_->setSocketOption(ProducerCallbacksOptions::CONTENT_PRODUCED, + producer_callback); producer_->connect(); - consumer_->setSocketOption(ConsumerCallbacksOptions::CONTENT_OBJECT_TO_VERIFY, - (ConsumerContentObjectVerificationCallback)[]( - ConsumerSocket & s, const ContentObject &c) - ->bool { return true; }); + consumer_->setSocketOption( + ConsumerCallbacksOptions::CONTENT_OBJECT_TO_VERIFY, + (ConsumerContentObjectVerificationCallback)[](ConsumerSocket & s, + const ContentObject &c) + ->bool { return true; }); - ConsumerContentCallback callback = + ConsumerContentCallback consumer_callback = std::bind(&AsyncFullDuplexSocket::onContentRetrieved, this, _1, _2, _3); consumer_->setSocketOption(ConsumerCallbacksOptions::CONTENT_RETRIEVED, - callback); + consumer_callback); consumer_->setSocketOption(GeneralTransportOptions::MAX_INTEREST_RETX, uint32_t{4}); diff --git a/libtransport/src/hicn/transport/interfaces/full_duplex_socket.h b/libtransport/src/hicn/transport/interfaces/full_duplex_socket.h old mode 100755 new mode 100644 diff --git a/libtransport/src/hicn/transport/interfaces/publication_options.h b/libtransport/src/hicn/transport/interfaces/publication_options.h old mode 100755 new mode 100644 diff --git a/libtransport/src/hicn/transport/interfaces/rtc_socket_consumer.cc b/libtransport/src/hicn/transport/interfaces/rtc_socket_consumer.cc old mode 100755 new mode 100644 index cc4f478af..ef952a891 --- a/libtransport/src/hicn/transport/interfaces/rtc_socket_consumer.cc +++ b/libtransport/src/hicn/transport/interfaces/rtc_socket_consumer.cc @@ -22,8 +22,7 @@ namespace interface { RTCConsumerSocket::RTCConsumerSocket(int protocol, asio::io_service &io_service) : ConsumerSocket(protocol, io_service) {} -RTCConsumerSocket::RTCConsumerSocket(int protocol) - : ConsumerSocket(protocol) {} +RTCConsumerSocket::RTCConsumerSocket(int protocol) : ConsumerSocket(protocol) {} RTCConsumerSocket::~RTCConsumerSocket() {} diff --git a/libtransport/src/hicn/transport/interfaces/rtc_socket_consumer.h b/libtransport/src/hicn/transport/interfaces/rtc_socket_consumer.h old mode 100755 new mode 100644 diff --git a/libtransport/src/hicn/transport/interfaces/rtc_socket_producer.cc b/libtransport/src/hicn/transport/interfaces/rtc_socket_producer.cc index f19502dee..84c80dad7 100644 --- a/libtransport/src/hicn/transport/interfaces/rtc_socket_producer.cc +++ b/libtransport/src/hicn/transport/interfaces/rtc_socket_producer.cc @@ -72,7 +72,6 @@ RTCProducerSocket::RTCProducerSocket() prodLabel_ = ((rand() % 255) << 24UL); } - RTCProducerSocket::~RTCProducerSocket() {} void RTCProducerSocket::registerName(Prefix &producer_namespace) { diff --git a/libtransport/src/hicn/transport/interfaces/rtc_socket_producer.h b/libtransport/src/hicn/transport/interfaces/rtc_socket_producer.h old mode 100755 new mode 100644 diff --git a/libtransport/src/hicn/transport/interfaces/socket.h b/libtransport/src/hicn/transport/interfaces/socket.h old mode 100755 new mode 100644 diff --git a/libtransport/src/hicn/transport/interfaces/socket_consumer.h b/libtransport/src/hicn/transport/interfaces/socket_consumer.h old mode 100755 new mode 100644 diff --git a/libtransport/src/hicn/transport/interfaces/socket_options_default_values.h b/libtransport/src/hicn/transport/interfaces/socket_options_default_values.h old mode 100755 new mode 100644 diff --git a/libtransport/src/hicn/transport/interfaces/socket_options_keys.h b/libtransport/src/hicn/transport/interfaces/socket_options_keys.h old mode 100755 new mode 100644 diff --git a/libtransport/src/hicn/transport/interfaces/socket_producer.cc b/libtransport/src/hicn/transport/interfaces/socket_producer.cc old mode 100755 new mode 100644 index d9204f111..5bd522faf --- a/libtransport/src/hicn/transport/interfaces/socket_producer.cc +++ b/libtransport/src/hicn/transport/interfaces/socket_producer.cc @@ -54,7 +54,6 @@ ProducerSocket::ProducerSocket(asio::io_service &io_service) } ProducerSocket::~ProducerSocket() { - processing_thread_stop_ = true; portal_->stopEventsLoop(true); @@ -78,9 +77,7 @@ void ProducerSocket::serveForever() { } } -void ProducerSocket::stop() { - portal_->stopEventsLoop(); -} +void ProducerSocket::stop() { portal_->stopEventsLoop(); } void ProducerSocket::registerPrefix(const Prefix &producer_namespace) { served_namespaces_.push_back(producer_namespace); diff --git a/libtransport/src/hicn/transport/interfaces/socket_producer.h b/libtransport/src/hicn/transport/interfaces/socket_producer.h old mode 100755 new mode 100644 -- cgit 1.2.3-korg