From 229385955109b866a23c4ac2aa03d4d11044c39d Mon Sep 17 00:00:00 2001
From: "Enrico Loparco (eloparco)" <eloparco@cisco.com>
Date: Thu, 24 Jun 2021 09:15:41 +0200
Subject: [HICN-708] Rebase with master

Signed-off-by: Enrico Loparco (eloparco) <eloparco@cisco.com>
Change-Id: I2122e1d61dd3b2e039972624ffbdbcb3c5610159
---
 libtransport/src/protocols/rtc.cc | 52 +++++++++++----------------------------
 1 file changed, 15 insertions(+), 37 deletions(-)

(limited to 'libtransport/src/protocols/rtc.cc')

diff --git a/libtransport/src/protocols/rtc.cc b/libtransport/src/protocols/rtc.cc
index 72abb599a..a01b8daa5 100644
--- a/libtransport/src/protocols/rtc.cc
+++ b/libtransport/src/protocols/rtc.cc
@@ -13,12 +13,11 @@
  * limitations under the License.
  */
 
-#include <protocols/rtc.h>
-
 #include <hicn/transport/interfaces/socket_consumer.h>
 #include <implementation/socket_consumer.h>
-
 #include <math.h>
+#include <protocols/rtc.h>
+
 #include <random>
 
 namespace transport {
@@ -39,40 +38,10 @@ 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() {
-  if (is_running_) {
-    stop();
-  }
-}
-
-int RTCTransportProtocol::start() {
-  if (is_running_) return -1;
-
-  reset();
-  is_first_ = true;
-
-  probeRtt();
-  sentinelTimer();
-  newRound();
-  scheduleNextInterests();
-
-  is_first_ = false;
-  is_running_ = true;
-  portal_->runEventsLoop();
-  is_running_ = false;
-
-  return 0;
-}
-
-void RTCTransportProtocol::stop() {
-  if (!is_running_) return;
-
-  is_running_ = false;
-  portal_->stopEventsLoop();
-}
+RTCTransportProtocol::~RTCTransportProtocol() {}
 
 void RTCTransportProtocol::resume() {
   if (is_running_) return;
@@ -90,7 +59,7 @@ void RTCTransportProtocol::resume() {
 }
 
 // private
-void RTCTransportProtocol::reset() {
+void RTCTransportProtocol::initParams() {
   portal_->setConsumerCallback(this);
   // controller var
   currentState_ = HICN_RTC_SYNC_STATE;
@@ -143,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) {
@@ -372,6 +348,8 @@ void RTCTransportProtocol::computeMaxWindow(uint32_t productionRate,
 void RTCTransportProtocol::updateWindow() {
   if (currentState_ == HICN_RTC_SYNC_STATE) return;
 
+  if (estimatedBw_ == 0) return;
+
   if (currentCWin_ < maxCWin_ * 0.9) {
     currentCWin_ =
         min(maxCWin_, (uint32_t)(currentCWin_ * HICN_WIN_INCREASE_FACTOR));
-- 
cgit 1.2.3-korg