From a84ff82bb37ac53f20639d6e5e7f19d002459f31 Mon Sep 17 00:00:00 2001
From: Mauro Sardara <msardara@cisco.com>
Date: Tue, 9 Jun 2020 00:03:15 +0200
Subject: [HICN-623] Initialize is_async in ConsumerSocket constructor.

Also force transports to use base method TransportProtocol::start() instead
of redefining their own start(), in order to have the callbacks and the
boolean is_async_ initialized upon protocol start.

Signed-off-by: Mauro Sardara <msardara@cisco.com>
Change-Id: I780b26cca5b8dc59f0def5c08a032bbc90371acd
Signed-off-by: Mauro Sardara <msardara@cisco.com>
---
 libtransport/src/implementation/socket_consumer.h |  1 +
 libtransport/src/protocols/protocol.cc            | 11 +++++-----
 libtransport/src/protocols/rtc.cc                 | 26 +++++++++--------------
 libtransport/src/protocols/rtc.h                  |  3 ++-
 4 files changed, 18 insertions(+), 23 deletions(-)

(limited to 'libtransport')

diff --git a/libtransport/src/implementation/socket_consumer.h b/libtransport/src/implementation/socket_consumer.h
index 175678209..5e5073956 100644
--- a/libtransport/src/implementation/socket_consumer.h
+++ b/libtransport/src/implementation/socket_consumer.h
@@ -54,6 +54,7 @@ class ConsumerSocket : public Socket<BasePortal> {
         rate_estimation_observer_(nullptr),
         rate_estimation_batching_parameter_(default_values::batch),
         rate_estimation_choice_(0),
+        is_async_(false),
         verifier_(std::make_shared<utils::Verifier>()),
         verify_signature_(false),
         key_content_(false),
diff --git a/libtransport/src/protocols/protocol.cc b/libtransport/src/protocols/protocol.cc
index d1bd566a0..451fef80d 100644
--- a/libtransport/src/protocols/protocol.cc
+++ b/libtransport/src/protocols/protocol.cc
@@ -48,12 +48,6 @@ int TransportProtocol::start() {
   // If the protocol is already running, return otherwise set as running
   if (is_running_) return -1;
 
-  // Reset the protocol state machine
-  reset();
-
-  // Set it is the first time we schedule an interest
-  is_first_ = true;
-
   // Get all callbacks references before starting
   socket_->getSocketOption(ConsumerCallbacksOptions::INTEREST_RETRANSMISSION,
                            &on_interest_retransmission_);
@@ -75,6 +69,11 @@ int TransportProtocol::start() {
                            &on_payload_);
   socket_->getSocketOption(GeneralTransportOptions::ASYNC_MODE, is_async_);
 
+  // Set it is the first time we schedule an interest
+  is_first_ = true;
+
+  // Reset the protocol state machine
+  reset();
   // Schedule next interests
   scheduleNextInterests();
 
diff --git a/libtransport/src/protocols/rtc.cc b/libtransport/src/protocols/rtc.cc
index 3b10c7467..b1502f51f 100644
--- a/libtransport/src/protocols/rtc.cc
+++ b/libtransport/src/protocols/rtc.cc
@@ -38,24 +38,11 @@ RTCTransportProtocol::RTCTransportProtocol(
   sentinel_timer_ =
       std::make_unique<asio::steady_timer>(portal_->getIoService());
   round_timer_ = std::make_unique<asio::steady_timer>(portal_->getIoService());
-  reset();
+  initParams();
 }
 
 RTCTransportProtocol::~RTCTransportProtocol() {}
 
-int RTCTransportProtocol::start() {
-  if (is_running_) return -1;
-
-  reset();
-  is_first_ = true;
-
-  probeRtt();
-  sentinelTimer();
-  newRound();
-
-  return TransportProtocol::start();
-}
-
 void RTCTransportProtocol::resume() {
   if (is_running_) return;
 
@@ -72,7 +59,7 @@ void RTCTransportProtocol::resume() {
 }
 
 // private
-void RTCTransportProtocol::reset() {
+void RTCTransportProtocol::initParams() {
   portal_->setConsumerCallback(this);
   // controller var
   currentState_ = HICN_RTC_SYNC_STATE;
@@ -125,7 +112,14 @@ void RTCTransportProtocol::reset() {
 
   socket_->setSocketOption(GeneralTransportOptions::INTEREST_LIFETIME,
                            (uint32_t)HICN_RTC_INTEREST_LIFETIME);
-  // XXX this should be done by the application
+}
+
+// private
+void RTCTransportProtocol::reset() {
+  initParams();
+  probeRtt();
+  sentinelTimer();
+  newRound();
 }
 
 uint32_t max(uint32_t a, uint32_t b) {
diff --git a/libtransport/src/protocols/rtc.h b/libtransport/src/protocols/rtc.h
index a12c96b69..9f1bcc25b 100644
--- a/libtransport/src/protocols/rtc.h
+++ b/libtransport/src/protocols/rtc.h
@@ -93,7 +93,7 @@ class RTCTransportProtocol : public TransportProtocol,
 
   ~RTCTransportProtocol();
 
-  int start() override;
+  using TransportProtocol::start;
 
   using TransportProtocol::stop;
 
@@ -103,6 +103,7 @@ class RTCTransportProtocol : public TransportProtocol,
 
  private:
   // algo functions
+  void initParams();
   void reset() override;
 
   // CC functions
-- 
cgit 1.2.3-korg