diff options
author | Mauro Sardara <msardara@cisco.com> | 2019-01-19 01:29:33 +0100 |
---|---|---|
committer | Mauro Sardara <msardara@cisco.com> | 2019-01-21 12:03:48 +0100 |
commit | 9e5f41ed6ebe64a789916794626485460078c420 (patch) | |
tree | d2ac3090026ec8929558e88eca533f8787a6ff0b /libtransport/src/hicn/transport/interfaces | |
parent | d13d37534d9449dd54277af664310d5f957dc44a (diff) |
- Code style fix
- Improved vpp binary api interface
- Correction in object pool destructor
- Fix error in Memif Connector
Change-Id: Id1dd9219fc1ac0b3717ae019ebff17373bebc635
Signed-off-by: Mauro Sardara <msardara@cisco.com>
Diffstat (limited to 'libtransport/src/hicn/transport/interfaces')
-rw-r--r--[-rwxr-xr-x] | libtransport/src/hicn/transport/interfaces/full_duplex_socket.cc | 7 | ||||
-rw-r--r--[-rwxr-xr-x] | libtransport/src/hicn/transport/interfaces/rtc_socket_producer.cc | 2 | ||||
-rw-r--r--[-rwxr-xr-x] | libtransport/src/hicn/transport/interfaces/socket_consumer.cc | 6 |
3 files changed, 8 insertions, 7 deletions
diff --git a/libtransport/src/hicn/transport/interfaces/full_duplex_socket.cc b/libtransport/src/hicn/transport/interfaces/full_duplex_socket.cc index 7b6342262..37e1d7b3e 100755..100644 --- a/libtransport/src/hicn/transport/interfaces/full_duplex_socket.cc +++ b/libtransport/src/hicn/transport/interfaces/full_duplex_socket.cc @@ -68,9 +68,10 @@ AsyncFullDuplexSocket::AsyncFullDuplexSocket(const Prefix &locator, ConsumerSocket & s, const ContentObject &c) ->bool { return true; }); - consumer_->setSocketOption( - ConsumerCallbacksOptions::CONTENT_RETRIEVED, - std::bind(&AsyncFullDuplexSocket::onContentRetrieved, this, _1, _2, _3)); + ConsumerContentCallback callback = + std::bind(&AsyncFullDuplexSocket::onContentRetrieved, this, _1, _2, _3); + consumer_->setSocketOption(ConsumerCallbacksOptions::CONTENT_RETRIEVED, + callback); consumer_->setSocketOption(GeneralTransportOptions::MAX_INTEREST_RETX, uint32_t{4}); diff --git a/libtransport/src/hicn/transport/interfaces/rtc_socket_producer.cc b/libtransport/src/hicn/transport/interfaces/rtc_socket_producer.cc index d8a9d53b9..ec8c4c69e 100755..100644 --- a/libtransport/src/hicn/transport/interfaces/rtc_socket_producer.cc +++ b/libtransport/src/hicn/transport/interfaces/rtc_socket_producer.cc @@ -13,9 +13,9 @@ * limitations under the License. */ +#include <hicn/transport/interfaces/rtc_socket_producer.h> #include <stdlib.h> #include <time.h> -#include <hicn/transport/interfaces/rtc_socket_producer.h> #define NACK_HEADER_SIZE 8 // bytes #define TIMESTAMP_LEN 8 // bytes diff --git a/libtransport/src/hicn/transport/interfaces/socket_consumer.cc b/libtransport/src/hicn/transport/interfaces/socket_consumer.cc index 8109d0e99..27ed4e65f 100755..100644 --- a/libtransport/src/hicn/transport/interfaces/socket_consumer.cc +++ b/libtransport/src/hicn/transport/interfaces/socket_consumer.cc @@ -137,11 +137,11 @@ void ConsumerSocket::stop() { transport_protocol_->stop(); } - //is_running_ = false; + // is_running_ = false; } void ConsumerSocket::resume() { - if(!transport_protocol_->isRunning()){ + if (!transport_protocol_->isRunning()) { transport_protocol_->resume(); } } @@ -548,7 +548,7 @@ int ConsumerSocket::getSocketOption(int socket_option_key, case GeneralTransportOptions::RUNNING: socket_option_value = transport_protocol_->isRunning(); - return SOCKET_OPTION_GET; + return SOCKET_OPTION_GET; case OtherOptions::VIRTUAL_DOWNLOAD: socket_option_value = virtual_download_; |