summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichele Papalini <micpapal@cisco.com>2020-10-20 09:05:56 +0000
committerGerrit Code Review <gerrit@fd.io>2020-10-20 09:05:56 +0000
commitdd89047e434afe4c79e6771f0a50b5ae1e08798e (patch)
tree46fa885ddf39e43edb5119e4ee3415bc027fc401
parent56125366e9d8e526f64b43f661c6c5c3b2fb6f8a (diff)
parente8b709a3c4537c7e71c71575e4835fa761c08d46 (diff)
Merge "[HICN-648] Optionally reset RAAQM window in a per-session basis"
-rw-r--r--cmake/Modules/Packager.cmake2
-rw-r--r--libtransport/includes/hicn/transport/interfaces/socket_options_keys.h1
-rw-r--r--libtransport/src/implementation/socket_consumer.h11
-rw-r--r--libtransport/src/protocols/raaqm.cc8
4 files changed, 21 insertions, 1 deletions
diff --git a/cmake/Modules/Packager.cmake b/cmake/Modules/Packager.cmake
index 5bffa1ebc..94b0e96a7 100644
--- a/cmake/Modules/Packager.cmake
+++ b/cmake/Modules/Packager.cmake
@@ -97,7 +97,7 @@ macro(make_packages)
message(STATUS "Build number is: ${bld}")
#define DEB and RPM version numbers
- if(${RELEASE} AND ${RELEASE} STREQUAL "-release")
+ if("${RELEASE}" STREQUAL "-release")
set(deb_ver "${tag}-release")
set(rpm_ver "${tag}-release")
else()
diff --git a/libtransport/includes/hicn/transport/interfaces/socket_options_keys.h b/libtransport/includes/hicn/transport/interfaces/socket_options_keys.h
index 0b7a79c3d..f50e919b4 100644
--- a/libtransport/includes/hicn/transport/interfaces/socket_options_keys.h
+++ b/libtransport/includes/hicn/transport/interfaces/socket_options_keys.h
@@ -66,6 +66,7 @@ typedef enum {
MINIMUM_DROP_PROBABILITY = 205,
PATH_ID = 206,
RTT_STATS = 207,
+ PER_SESSION_CWINDOW_RESET = 208
} RaaqmTransportOptions;
typedef enum {
diff --git a/libtransport/src/implementation/socket_consumer.h b/libtransport/src/implementation/socket_consumer.h
index 5e5073956..87965923e 100644
--- a/libtransport/src/implementation/socket_consumer.h
+++ b/libtransport/src/implementation/socket_consumer.h
@@ -58,6 +58,7 @@ class ConsumerSocket : public Socket<BasePortal> {
verifier_(std::make_shared<utils::Verifier>()),
verify_signature_(false),
key_content_(false),
+ reset_window_(false),
on_interest_output_(VOID_HANDLER),
on_interest_timeout_(VOID_HANDLER),
on_interest_satisfied_(VOID_HANDLER),
@@ -343,6 +344,11 @@ class ConsumerSocket : public Socket<BasePortal> {
result = SOCKET_OPTION_SET;
break;
+ case RaaqmTransportOptions::PER_SESSION_CWINDOW_RESET:
+ reset_window_ = socket_option_value;
+ result = SOCKET_OPTION_SET;
+ break;
+
default:
return result;
}
@@ -648,6 +654,10 @@ class ConsumerSocket : public Socket<BasePortal> {
socket_option_value = is_async_;
break;
+ case RaaqmTransportOptions::PER_SESSION_CWINDOW_RESET:
+ socket_option_value = reset_window_;
+ break;
+
default:
return SOCKET_OPTION_NOT_GET;
}
@@ -923,6 +933,7 @@ class ConsumerSocket : public Socket<BasePortal> {
PARCKeyId *key_id_;
std::atomic_bool verify_signature_;
bool key_content_;
+ bool reset_window_;
ConsumerInterestCallback on_interest_retransmission_;
ConsumerInterestCallback on_interest_output_;
diff --git a/libtransport/src/protocols/raaqm.cc b/libtransport/src/protocols/raaqm.cc
index 783d6194b..5023adf2e 100644
--- a/libtransport/src/protocols/raaqm.cc
+++ b/libtransport/src/protocols/raaqm.cc
@@ -116,6 +116,14 @@ void RaaqmTransportProtocol::reset() {
// Reset protocol variables
interests_in_flight_ = 0;
t0_ = utils::SteadyClock::now();
+
+ // Optionally reset congestion window
+ bool reset_window;
+ socket_->getSocketOption(RaaqmTransportOptions::PER_SESSION_CWINDOW_RESET,
+ reset_window);
+ if (reset_window) {
+ current_window_size_ = 1;
+ }
}
bool RaaqmTransportProtocol::verifyKeyPackets() {