diff options
author | Luca Muscariello <lumuscar@cisco.com> | 2022-03-30 22:29:28 +0200 |
---|---|---|
committer | Mauro Sardara <msardara@cisco.com> | 2022-03-31 19:51:47 +0200 |
commit | c46e5df56b67bb8ea7a068d39324c640084ead2b (patch) | |
tree | eddeb17785938e09bc42eec98ee09b8a28846de6 /libtransport/src/core/manifest.h | |
parent | 18fa668f25d3cc5463417ce7df6637e31578e898 (diff) |
feat: boostrap hicn 22.02
The current patch provides several new features, improvements,
bug fixes and also complete rewrite of entire components.
- lib
The hicn packet parser has been improved with a new packet
format fully based on UDP. The TCP header is still temporarily
supported but the UDP header will replace completely the new hicn
packet format. Improvements have been made to make sure every
packet parsing operation is made via this library. The current
new header can be used as header between the payload and the
UDP header or as trailer in the UDP surplus area to be tested
when UDP options will start to be used.
- hicn-light
The portable packet forwarder has been completely rewritten from
scratch with the twofold objective to improve performance and
code size but also to drop dependencies such as libparc which is
now removed by the current implementation.
- hicn control
the control library is the agent that is used to program the
packet forwarders via their binary API. This component has
benefited from significant improvements in terms of interaction
model which is now event driven and more robust to failures.
- VPP plugin has been updated to support VPP 22.02
- transport
Major improvement have been made to the RTC protocol, to the
support of IO modules and to the security sub system. Signed
manifests are the default data authenticity and integrity framework.
Confidentiality can be enabled by sharing the encryption key to the
prod/cons layer. The library has been tested with group key based
applications such as broadcast/multicast and real-time on-line
meetings with trusted server keys or MLS.
- testing
Unit testing has been introduced using GoogleTest. One third of
the code base is covered by unit testing with priority on
critical features. Functional testing has also been introduce
using Docker, linux bridging and Robot Framework to define
test with Less Code techniques to facilitate the extension
of the coverage.
Co-authored-by: Mauro Sardara <msardara@cisco.com>
Co-authored-by: Jordan Augé <jordan.auge+fdio@cisco.com>
Co-authored-by: Michele Papalini <micpapal@cisco.com>
Co-authored-by: Angelo Mantellini <manangel@cisco.com>
Co-authored-by: Jacques Samain <jsamain@cisco.com>
Co-authored-by: Olivier Roques <oroques+fdio@cisco.com>
Co-authored-by: Enrico Loparco <eloparco@cisco.com>
Co-authored-by: Giulio Grassi <gigrassi@cisco.com>
Change-Id: I75d0ef70f86d921e3ef503c99271216ff583c215
Signed-off-by: Luca Muscariello <muscariello@ieee.org>
Signed-off-by: Mauro Sardara <msardara@cisco.com>
Diffstat (limited to 'libtransport/src/core/manifest.h')
-rw-r--r-- | libtransport/src/core/manifest.h | 74 |
1 files changed, 51 insertions, 23 deletions
diff --git a/libtransport/src/core/manifest.h b/libtransport/src/core/manifest.h index 9b25ebd67..5bdbfc6ff 100644 --- a/libtransport/src/core/manifest.h +++ b/libtransport/src/core/manifest.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2017-2019 Cisco and/or its affiliates. + * Copyright (c) 2021 Cisco and/or its affiliates. * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at: @@ -16,6 +16,7 @@ #pragma once #include <core/manifest_format.h> +#include <glog/logging.h> #include <hicn/transport/core/content_object.h> #include <hicn/transport/core/name.h> @@ -40,17 +41,20 @@ class Manifest : public Base { using Encoder = typename FormatTraits::Encoder; using Decoder = typename FormatTraits::Decoder; - Manifest(std::size_t signature_size = 0) - : Base(HF_INET6_TCP_AH, signature_size), + Manifest(Packet::Format format, std::size_t signature_size = 0) + : Base(format, signature_size), encoder_(*this, signature_size), decoder_(*this) { + DCHECK(_is_ah(format)); Base::setPayloadType(PayloadType::MANIFEST); } - Manifest(const core::Name &name, std::size_t signature_size = 0) - : Base(name, HF_INET6_TCP_AH, signature_size), + Manifest(Packet::Format format, const core::Name &name, + std::size_t signature_size = 0) + : Base(name, format, signature_size), encoder_(*this, signature_size), decoder_(*this) { + DCHECK(_is_ah(format)); Base::setPayloadType(PayloadType::MANIFEST); } @@ -62,6 +66,11 @@ class Manifest : public Base { Base::setPayloadType(PayloadType::MANIFEST); } + // Useful for decoding manifests while avoiding packet copy + template <typename T> + Manifest(T &base) + : Base(base.getFormat()), encoder_(base, 0, false), decoder_(base) {} + virtual ~Manifest() = default; std::size_t estimateManifestSize(std::size_t additional_entries = 0) { @@ -78,24 +87,27 @@ class Manifest : public Base { Manifest &decode() { Manifest::decoder_.decode(); - manifest_type_ = decoder_.getManifestType(); + manifest_type_ = decoder_.getType(); + manifest_transport_type_ = decoder_.getTransportType(); hash_algorithm_ = decoder_.getHashAlgorithm(); - is_last_ = decoder_.getIsFinalManifest(); + is_last_ = decoder_.getIsLast(); return static_cast<ManifestImpl &>(*this).decodeImpl(); } - static std::size_t getManifestHeaderSize() { - return Encoder::getManifestHeaderSize(); + static std::size_t manifestHeaderSize( + interface::ProductionProtocolAlgorithms transport_type = + interface::ProductionProtocolAlgorithms::UNKNOWN) { + return Encoder::manifestHeaderSize(transport_type); } - static std::size_t getManifestEntrySize() { - return Encoder::getManifestEntrySize(); + static std::size_t manifestEntrySize() { + return Encoder::manifestEntrySize(); } - Manifest &setManifestType(ManifestType type) { + Manifest &setType(ManifestType type) { manifest_type_ = type; - encoder_.setManifestType(manifest_type_); + encoder_.setType(manifest_type_); return *this; } @@ -105,31 +117,46 @@ class Manifest : public Base { return *this; } - auth::CryptoHashType getHashAlgorithm() { return hash_algorithm_; } + auth::CryptoHashType getHashAlgorithm() const { return hash_algorithm_; } - ManifestType getManifestType() const { return manifest_type_; } + ManifestType getType() const { return manifest_type_; } + + interface::ProductionProtocolAlgorithms getTransportType() const { + return manifest_transport_type_; + } - bool isFinalManifest() const { return is_last_; } + bool getIsLast() const { return is_last_; } Manifest &setVersion(ManifestVersion version) { encoder_.setVersion(version); return *this; } - Manifest &setFinalBlockNumber(std::uint32_t final_block_number) { - encoder_.setFinalBlockNumber(final_block_number); + Manifest &setParamsBytestream(const ParamsBytestream ¶ms) { + manifest_transport_type_ = + interface::ProductionProtocolAlgorithms::BYTE_STREAM; + encoder_.setParamsBytestream(params); return *this; } - uint32_t getFinalBlockNumber() const { - return decoder_.getFinalBlockNumber(); + Manifest &setParamsRTC(const ParamsRTC ¶ms) { + manifest_transport_type_ = + interface::ProductionProtocolAlgorithms::RTC_PROD; + encoder_.setParamsRTC(params); + return *this; + } + + ParamsBytestream getParamsBytestream() const { + return decoder_.getParamsBytestream(); } + ParamsRTC getParamsRTC() const { return decoder_.getParamsRTC(); } + ManifestVersion getVersion() const { return decoder_.getVersion(); } - Manifest &setFinalManifest(bool is_final_manifest) { - encoder_.setIsFinalManifest(is_final_manifest); - is_last_ = is_final_manifest; + Manifest &setIsLast(bool is_last) { + encoder_.setIsLast(is_last); + is_last_ = is_last; return *this; } @@ -141,6 +168,7 @@ class Manifest : public Base { protected: ManifestType manifest_type_; + interface::ProductionProtocolAlgorithms manifest_transport_type_; auth::CryptoHashType hash_algorithm_; bool is_last_; |