diff options
Diffstat (limited to 'libtransport/src/hicn/transport/core')
7 files changed, 18 insertions, 14 deletions
diff --git a/libtransport/src/hicn/transport/core/hicn_forwarder_interface.cc b/libtransport/src/hicn/transport/core/hicn_forwarder_interface.cc index e8b38cd7b..9dc3b63bb 100644 --- a/libtransport/src/hicn/transport/core/hicn_forwarder_interface.cc +++ b/libtransport/src/hicn/transport/core/hicn_forwarder_interface.cc @@ -65,9 +65,13 @@ void HicnForwarderInterface::registerRoute(Prefix &prefix) { } // Fill remaining payload fields +#ifndef _WIN32 strcpy(route_to_self->symbolic_or_connid, identifier); +#else + strcpy_s(route_to_self->symbolic_or_connid, strlen(route_to_self->symbolic_or_connid), identifier); +#endif route_to_self->cost = 1; - route_to_self->len = prefix.getPrefixLength(); + route_to_self->len = (uint8_t) prefix.getPrefixLength(); // Allocate and fill the header route_to_self->command_id = ADD_ROUTE; diff --git a/libtransport/src/hicn/transport/core/memif_connector.h b/libtransport/src/hicn/transport/core/memif_connector.h index ff838930f..6e76b78da 100644 --- a/libtransport/src/hicn/transport/core/memif_connector.h +++ b/libtransport/src/hicn/transport/core/memif_connector.h @@ -47,6 +47,7 @@ typedef struct memif_connection memif_connection_t; class MemifConnector : public Connector { typedef void *memif_conn_handle_t; + public: MemifConnector(PacketReceivedCallback &&receive_callback, OnReconnect &&on_reconnect_callback, diff --git a/libtransport/src/hicn/transport/core/name.cc b/libtransport/src/hicn/transport/core/name.cc index 10c45eb08..ba3e9e825 100644 --- a/libtransport/src/hicn/transport/core/name.cc +++ b/libtransport/src/hicn/transport/core/name.cc @@ -67,7 +67,7 @@ Name::Name(const std::string &uri) { try { seq_number = tokenizer.nextToken(); - } catch (errors::TokenizerException &e) { + } catch (errors::TokenizerException) { seq_number = "0"; } diff --git a/libtransport/src/hicn/transport/core/packet.cc b/libtransport/src/hicn/transport/core/packet.cc index cbfe082d3..761668116 100644 --- a/libtransport/src/hicn/transport/core/packet.cc +++ b/libtransport/src/hicn/transport/core/packet.cc @@ -32,7 +32,8 @@ namespace core { const core::Name Packet::base_name("0::0|0"); Packet::Packet(Format format) - : packet_(utils::MemBuf::create(getHeaderSizeFromFormat(format, 256)).release()), + : packet_(utils::MemBuf::create(getHeaderSizeFromFormat(format, 256)) + .release()), packet_start_(packet_->writableData()), header_head_(packet_.get()), payload_head_(nullptr), @@ -50,15 +51,14 @@ Packet::Packet(MemBufPtr &&buffer) header_head_(packet_.get()), payload_head_(nullptr), format_(getFormatFromBuffer(packet_start_)) { - int signature_size = 0; if (_is_ah(format_)) { - signature_size = getSignatureSize(); + signature_size = (uint32_t)getSignatureSize(); } auto header_size = getHeaderSizeFromFormat(format_, signature_size); - auto payload_length = packet_->length() - header_size; + auto payload_length = packet_->length() - header_size - signature_size; if (!payload_length) { return; @@ -69,7 +69,7 @@ Packet::Packet(MemBufPtr &&buffer) if (payload_length) { auto payload = packet_->cloneOne(); payload_head_ = payload.get(); - payload_head_->advance(header_size); + payload_head_->advance(header_size + signature_size); payload_head_->append(payload_length); packet_->prependChain(std::move(payload)); packet_->append(header_size); @@ -283,10 +283,10 @@ void Packet::setSignatureSize(std::size_t size_bytes) { packet_->append(size_bytes); } -uint8_t * Packet::getSignature() const { - uint8_t * signature; - int ret = hicn_packet_get_signature( - format_, (hicn_header_t *)packet_start_, &signature); +uint8_t *Packet::getSignature() const { + uint8_t *signature; + int ret = hicn_packet_get_signature(format_, (hicn_header_t *)packet_start_, + &signature); if (ret < 0) { throw errors::RuntimeException("Packet without Authentication Header."); diff --git a/libtransport/src/hicn/transport/core/packet.h b/libtransport/src/hicn/transport/core/packet.h index 038676540..49a558333 100644 --- a/libtransport/src/hicn/transport/core/packet.h +++ b/libtransport/src/hicn/transport/core/packet.h @@ -133,7 +133,7 @@ class Packet : public std::enable_shared_from_this<Packet> { std::size_t getSignatureSize() const; - uint8_t * getSignature() const; + uint8_t *getSignature() const; void setSignatureTimestamp(const uint64_t ×tamp); diff --git a/libtransport/src/hicn/transport/core/portal.h b/libtransport/src/hicn/transport/core/portal.h index e26e490ad..0932b56c6 100644 --- a/libtransport/src/hicn/transport/core/portal.h +++ b/libtransport/src/hicn/transport/core/portal.h @@ -255,7 +255,6 @@ class Portal { private: TRANSPORT_ALWAYS_INLINE void processIncomingMessages( Packet::MemBufPtr &&packet_buffer) { - bool is_stopped = io_service_.stopped(); if (TRANSPORT_EXPECT_FALSE(is_stopped)) { return; diff --git a/libtransport/src/hicn/transport/core/prefix.cc b/libtransport/src/hicn/transport/core/prefix.cc index 575bcc2ed..74d1466ac 100644 --- a/libtransport/src/hicn/transport/core/prefix.cc +++ b/libtransport/src/hicn/transport/core/prefix.cc @@ -155,7 +155,7 @@ Prefix &Prefix::setNetwork(std::string &network) { } Name Prefix::makeRandomName() const { - srand(time(nullptr)); + srand((unsigned int)time(nullptr)); if (ip_address_.family == AF_INET6) { std::default_random_engine eng((std::random_device())()); |