From a473f64e8d74df3b82fdcc3dbea34293bc0f2444 Mon Sep 17 00:00:00 2001 From: Mauro Sardara Date: Wed, 22 Feb 2017 20:09:10 +0100 Subject: Minor fixes Change-Id: I58d6ad647e272f66a96ca483c3b47798f4023ea9 Signed-off-by: Mauro Sardara --- icnet/ccnx/icnet_ccnx_portal.cc | 13 +------------ 1 file changed, 1 insertion(+), 12 deletions(-) (limited to 'icnet/ccnx/icnet_ccnx_portal.cc') diff --git a/icnet/ccnx/icnet_ccnx_portal.cc b/icnet/ccnx/icnet_ccnx_portal.cc index 5b14ace3..99e2ee7f 100644 --- a/icnet/ccnx/icnet_ccnx_portal.cc +++ b/icnet/ccnx/icnet_ccnx_portal.cc @@ -68,9 +68,6 @@ void Portal::sendInterest(const Interest &interest, std::unordered_map>::iterator it = pending_interest_hash_table_.find(name); if (it != pending_interest_hash_table_.end()) { it->second->getOnTimeoutCallback()(*it->second->getInterest()); - } else { - std::cerr << "Timeout on interest already received_! [" << it->second->getInterest()->getName() << "]" - << std::endl; } } }; @@ -148,12 +145,7 @@ void Portal::processContentObject(CCNxMetaMessage *response) { // Content object for a consumer CCNxContentObject *content_object = ccnxContentObject_Acquire(ccnxMetaMessage_GetContentObject(response)); - CCNxName *n = ccnxContentObject_GetName(content_object); - size_t n_components = ccnxName_GetSegmentCount(n); - CCNxNameSegment *last_segment = ccnxName_GetSegment(n, n_components - 1); - - bool has_chunk_number = ccnxNameSegmentNumber_IsValid(last_segment); PendingInterestHashTable::iterator it = pending_interest_hash_table_.find(Name(n)); @@ -167,10 +159,7 @@ void Portal::processContentObject(CCNxMetaMessage *response) { if (!interest_ptr->isReceived()) { interest_ptr->setReceived(); interest_ptr->getOnDataCallback()(*interest_ptr->getInterest(), *data_ptr); - - if (!has_chunk_number) { - pending_interest_hash_table_.erase(interest_ptr->getInterest()->getName()); - } + pending_interest_hash_table_.erase(interest_ptr->getInterest()->getName()); } } -- cgit 1.2.3-korg