diff options
author | Angelo Mantellini <manangel@cisco.com> | 2019-03-08 15:35:31 +0100 |
---|---|---|
committer | Angelo Mantellini <manangel@cisco.com> | 2019-03-08 15:46:13 +0100 |
commit | 83cb1b630a3b9da5ca92814de1bac4e7f0bdfb71 (patch) | |
tree | 767a67667da286cc414d9b7099fd5b524dce40e7 /libtransport/src/hicn/transport/protocols | |
parent | 6aaef596f68a514036d5212fc8697bdaf371e5af (diff) |
[HICN-102] Remove warnings and compilation errors in hicn on windows
Change-Id: Ibb5d90fe35097a29fa6edccd3c7859d043888717
Signed-off-by: Angelo Mantellini <manangel@cisco.com>
Diffstat (limited to 'libtransport/src/hicn/transport/protocols')
4 files changed, 13 insertions, 13 deletions
diff --git a/libtransport/src/hicn/transport/protocols/indexing_manager.h b/libtransport/src/hicn/transport/protocols/indexing_manager.h index 888b17d9d..c692695a3 100644 --- a/libtransport/src/hicn/transport/protocols/indexing_manager.h +++ b/libtransport/src/hicn/transport/protocols/indexing_manager.h @@ -122,7 +122,7 @@ class IncrementalIndexManager : public IndexVerificationManager { public: IncrementalIndexManager(interface::ConsumerSocket *icn_socket) : socket_(icn_socket), - final_suffix_(std::numeric_limits<uint64_t>::max()), + final_suffix_(std::numeric_limits<uint32_t>::max()), next_download_suffix_(0), next_reassembly_suffix_(0), verification_manager_( @@ -134,7 +134,7 @@ class IncrementalIndexManager : public IndexVerificationManager { virtual ~IncrementalIndexManager() {} TRANSPORT_ALWAYS_INLINE virtual void reset() override { - final_suffix_ = std::numeric_limits<uint64_t>::max(); + final_suffix_ = std::numeric_limits<uint32_t>::max(); next_download_suffix_ = 0; next_reassembly_suffix_ = 0; } @@ -157,7 +157,7 @@ class IncrementalIndexManager : public IndexVerificationManager { } TRANSPORT_ALWAYS_INLINE virtual bool isFinalSuffixDiscovered() override { - return final_suffix_ != std::numeric_limits<uint64_t>::max(); + return final_suffix_ != std::numeric_limits<uint32_t>::max(); } TRANSPORT_ALWAYS_INLINE virtual uint32_t getFinalSuffix() override { @@ -182,9 +182,9 @@ class IncrementalIndexManager : public IndexVerificationManager { protected: interface::ConsumerSocket *socket_; - uint64_t final_suffix_; - uint64_t next_download_suffix_; - uint64_t next_reassembly_suffix_; + uint32_t final_suffix_; + uint32_t next_download_suffix_; + uint32_t next_reassembly_suffix_; std::unique_ptr<VerificationManager> verification_manager_; }; diff --git a/libtransport/src/hicn/transport/protocols/manifest_indexing_manager.cc b/libtransport/src/hicn/transport/protocols/manifest_indexing_manager.cc index 1afb4eaac..2d7d8de3e 100644 --- a/libtransport/src/hicn/transport/protocols/manifest_indexing_manager.cc +++ b/libtransport/src/hicn/transport/protocols/manifest_indexing_manager.cc @@ -111,7 +111,7 @@ bool ManifestIndexManager::onManifest( // Send as many manifest as required for filling window. do { segment_count += segments_in_manifest; - next_manifest_ += segments_in_manifest; + next_manifest_ += (uint32_t)segments_in_manifest; Interest::Ptr interest = getPacket(); name.setSuffix(next_manifest_); @@ -156,7 +156,7 @@ bool ManifestIndexManager::onContentObject( bool ret = false; - auto it = suffix_hash_map_.find(segment); + auto it = suffix_hash_map_.find((const unsigned int)segment); if (it != suffix_hash_map_.end()) { auto hash_type = static_cast<utils::CryptoHashType>(it->second.second); auto data_packet_digest = content_object.computeDigest(it->second.second); diff --git a/libtransport/src/hicn/transport/protocols/raaqm.cc b/libtransport/src/hicn/transport/protocols/raaqm.cc index f5eb48bd8..cd3a6cb85 100644 --- a/libtransport/src/hicn/transport/protocols/raaqm.cc +++ b/libtransport/src/hicn/transport/protocols/raaqm.cc @@ -151,7 +151,7 @@ void RaaqmTransportProtocol::afterContentReception( increaseWindow(); updateRtt(interest.getName().getSuffix()); this->rate_estimator_->onDataReceived((int)content_object.payloadSize() + - content_object.headerSize()); + (int)content_object.headerSize()); // Set drop probablility and window size accordingly RAAQM(); } @@ -468,7 +468,7 @@ void RaaqmTransportProtocol::sendInterest(std::uint64_t next_suffix) { auto interest = getPacket(); core::Name *name; socket_->getSocketOption(GeneralTransportOptions::NETWORK_NAME, &name); - name->setSuffix(next_suffix); + name->setSuffix((uint32_t)next_suffix); interest->setName(*name); uint32_t interest_lifetime; @@ -522,7 +522,7 @@ void RaaqmTransportProtocol::updateRtt(uint64_t segment) { now - interest_timepoints_[segment & mask]); // Update stats - updateStats(segment, rtt.count(), now); + updateStats((uint32_t)segment, rtt.count(), now); if (this->rate_estimator_) { this->rate_estimator_->onRttUpdate((double)rtt.count()); diff --git a/libtransport/src/hicn/transport/protocols/reassembly.cc b/libtransport/src/hicn/transport/protocols/reassembly.cc index 36cfb89a7..53180935c 100644 --- a/libtransport/src/hicn/transport/protocols/reassembly.cc +++ b/libtransport/src/hicn/transport/protocols/reassembly.cc @@ -41,7 +41,7 @@ void BaseReassembly::reassemble(ContentObject::Ptr &&content_object) { content_object->getName().getSuffix(), std::move(content_object))); } - auto it = received_packets_.find(index_); + auto it = received_packets_.find((const unsigned int)index_); while (it != received_packets_.end()) { if (it->second->getPayloadType() == PayloadType::CONTENT_OBJECT) { copyContent(*it->second); @@ -49,7 +49,7 @@ void BaseReassembly::reassemble(ContentObject::Ptr &&content_object) { } index_ = index_manager_->getNextReassemblySegment(); - it = received_packets_.find(index_); + it = received_packets_.find((const unsigned int)index_); } } |