diff options
| -rw-r--r-- | icnet/ccnx/icnet_ccnx_portal.cc | 13 | ||||
| -rw-r--r-- | icnet/transport/icnet_socket_options_default_values.h | 2 | ||||
| -rw-r--r-- | icnet/transport/icnet_transport_vegas.cc | 2 |
3 files changed, 3 insertions, 14 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()); } } diff --git a/icnet/transport/icnet_socket_options_default_values.h b/icnet/transport/icnet_socket_options_default_values.h index 0f830a54..4f6d68e9 100644 --- a/icnet/transport/icnet_socket_options_default_values.h +++ b/icnet/transport/icnet_socket_options_default_values.h @@ -25,7 +25,7 @@ const int content_object_expiry_time = 50000; // milliseconds -> 5 const int content_object_packet_size = 1500; // The ethernet MTU const int producer_socket_input_buffer_size = 150000; // Interests const int producer_socket_output_buffer_size = 150000; // Content Object -const int default_buffer_size = 8096 * 8096 * 2; +const int default_buffer_size = 8096 * 8 * 2; const int signature_size = 260; // bytes const int key_locator_size = 60; // bytes const int limit_guard = 80; // bytes diff --git a/icnet/transport/icnet_transport_vegas.cc b/icnet/transport/icnet_transport_vegas.cc index fae29bf8..166e4ef0 100644 --- a/icnet/transport/icnet_transport_vegas.cc +++ b/icnet/transport/icnet_transport_vegas.cc @@ -27,7 +27,7 @@ VegasTransportProtocol::VegasTransportProtocol(Socket *icnet_socket) current_window_size_(default_values::min_window_size), interests_in_flight_(0), segment_number_(0), - interest_retransmissions_(default_values::max_window_size), + interest_retransmissions_(default_values::default_buffer_size), interest_timepoints_(default_values::default_buffer_size), receive_buffer_(default_values::default_buffer_size), unverified_segments_(default_values::default_buffer_size), |