diff options
Diffstat (limited to 'libtransport/src/protocols')
-rw-r--r-- | libtransport/src/protocols/consumer.conf | 2 | ||||
-rw-r--r-- | libtransport/src/protocols/incremental_indexer.cc | 4 | ||||
-rw-r--r-- | libtransport/src/protocols/manifest_incremental_indexer.cc | 4 | ||||
-rw-r--r-- | libtransport/src/protocols/raaqm.cc | 5 |
4 files changed, 9 insertions, 6 deletions
diff --git a/libtransport/src/protocols/consumer.conf b/libtransport/src/protocols/consumer.conf index 1a366f32f..d0eab75ac 100644 --- a/libtransport/src/protocols/consumer.conf +++ b/libtransport/src/protocols/consumer.conf @@ -1,4 +1,4 @@ -; this file contais the parameters for RAAQM +; This file contains the parameters for RAAQM autotune = no lifetime = 500 retransmissions = 128 diff --git a/libtransport/src/protocols/incremental_indexer.cc b/libtransport/src/protocols/incremental_indexer.cc index e590b4fee..0872c4554 100644 --- a/libtransport/src/protocols/incremental_indexer.cc +++ b/libtransport/src/protocols/incremental_indexer.cc @@ -25,6 +25,8 @@ void IncrementalIndexer::onContentObject( core::Interest::Ptr &&interest, core::ContentObject::Ptr &&content_object) { using namespace interface; + TRANSPORT_LOGD("Receive content %s", content_object->getName().toString().c_str()); + if (TRANSPORT_EXPECT_FALSE(content_object->testRst())) { final_suffix_ = content_object->getName().getSuffix(); } @@ -50,4 +52,4 @@ void IncrementalIndexer::onContentObject( } } // namespace protocol -} // namespace transport
\ No newline at end of file +} // namespace transport diff --git a/libtransport/src/protocols/manifest_incremental_indexer.cc b/libtransport/src/protocols/manifest_incremental_indexer.cc index 1a2f9dec3..da835b577 100644 --- a/libtransport/src/protocols/manifest_incremental_indexer.cc +++ b/libtransport/src/protocols/manifest_incremental_indexer.cc @@ -37,10 +37,12 @@ ManifestIncrementalIndexer::ManifestIncrementalIndexer( void ManifestIncrementalIndexer::onContentObject( core::Interest::Ptr &&interest, core::ContentObject::Ptr &&content_object) { - // Check if mainfiest or not + // Check if manifest or not if (content_object->getPayloadType() == PayloadType::MANIFEST) { + TRANSPORT_LOGD("Receive content %s", content_object->getName().toString().c_str()); onUntrustedManifest(std::move(interest), std::move(content_object)); } else if (content_object->getPayloadType() == PayloadType::CONTENT_OBJECT) { + TRANSPORT_LOGD("Receive manifest %s", content_object->getName().toString().c_str()); onUntrustedContentObject(std::move(interest), std::move(content_object)); } } diff --git a/libtransport/src/protocols/raaqm.cc b/libtransport/src/protocols/raaqm.cc index 0a93dec44..f8da69ceb 100644 --- a/libtransport/src/protocols/raaqm.cc +++ b/libtransport/src/protocols/raaqm.cc @@ -460,7 +460,6 @@ void RaaqmTransportProtocol::scheduleNextInterests() { // send at least one interest if there are retransmissions to perform and // there is no space left in the window sendInterest(std::move(interest_to_retransmit_.front())); - TRANSPORT_LOGD("Window full, retransmit one content interest"); interest_to_retransmit_.pop(); } @@ -470,7 +469,6 @@ void RaaqmTransportProtocol::scheduleNextInterests() { while (interests_in_flight_ < current_window_size_) { if (interest_to_retransmit_.size() > 0) { sendInterest(std::move(interest_to_retransmit_.front())); - TRANSPORT_LOGD("Retransmit content interest"); interest_to_retransmit_.pop(); } else { index = index_manager_->getNextSuffix(); @@ -479,7 +477,6 @@ void RaaqmTransportProtocol::scheduleNextInterests() { } sendInterest(index); - TRANSPORT_LOGD("Send content interest %u", index); } } } @@ -508,6 +505,7 @@ bool RaaqmTransportProtocol::sendInterest(std::uint64_t next_suffix) { // performed by sendInterest, will result in 0 interest_retransmissions_[next_suffix & mask] = ~0; interest_timepoints_[next_suffix & mask] = utils::SteadyClock::now(); + sendInterest(std::move(interest)); return true; @@ -517,6 +515,7 @@ void RaaqmTransportProtocol::sendInterest(Interest::Ptr &&interest) { interests_in_flight_++; interest_retransmissions_[interest->getName().getSuffix() & mask]++; + TRANSPORT_LOGD("Send interest %s", interest->getName().toString().c_str()); portal_->sendInterest(std::move(interest)); } |