diff options
author | Mauro Sardara <msardara+fdio@cisco.com> | 2017-02-22 20:09:10 +0100 |
---|---|---|
committer | Mauro Sardara <msardara+fdio@cisco.com> | 2017-02-22 19:25:15 +0000 |
commit | a473f64e8d74df3b82fdcc3dbea34293bc0f2444 (patch) | |
tree | 4b614455bec9308322e45011fbce487d049dfea0 /icnet/ccnx/icnet_ccnx_portal.cc | |
parent | ba8541cad3a4069886444abbd1848b6ef3fff72c (diff) |
Minor fixes
Change-Id: I58d6ad647e272f66a96ca483c3b47798f4023ea9
Signed-off-by: Mauro Sardara <msardara+fdio@cisco.com>
Diffstat (limited to 'icnet/ccnx/icnet_ccnx_portal.cc')
-rw-r--r-- | icnet/ccnx/icnet_ccnx_portal.cc | 13 |
1 files changed, 1 insertions, 12 deletions
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<Name, std::unique_ptr<PendingInterest>>::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()); } } |