diff options
author | Enrico Loparco (eloparco) <eloparco@cisco.com> | 2021-06-24 09:15:41 +0200 |
---|---|---|
committer | Enrico Loparco (eloparco) <eloparco@cisco.com> | 2021-06-24 09:15:41 +0200 |
commit | 229385955109b866a23c4ac2aa03d4d11044c39d (patch) | |
tree | 0591f9c2fc4144d62330337cc2b94c63dfeded54 /libtransport/includes/hicn/transport/core/interest.h | |
parent | 6ffbb5ed61733b8dbef39b1a9d437e899e9359d7 (diff) |
[HICN-708] Rebase with master
Signed-off-by: Enrico Loparco (eloparco) <eloparco@cisco.com>
Change-Id: I2122e1d61dd3b2e039972624ffbdbcb3c5610159
Diffstat (limited to 'libtransport/includes/hicn/transport/core/interest.h')
-rw-r--r-- | libtransport/includes/hicn/transport/core/interest.h | 78 |
1 files changed, 63 insertions, 15 deletions
diff --git a/libtransport/includes/hicn/transport/core/interest.h b/libtransport/includes/hicn/transport/core/interest.h index c572afbff..b41b0c94a 100644 --- a/libtransport/includes/hicn/transport/core/interest.h +++ b/libtransport/includes/hicn/transport/core/interest.h @@ -17,6 +17,9 @@ #include <hicn/transport/core/name.h> #include <hicn/transport/core/packet.h> +#include <hicn/transport/utils/shared_ptr_utils.h> + +#include <set> namespace transport { @@ -24,25 +27,57 @@ namespace core { class Interest : public Packet /*, public std::enable_shared_from_this<Interest>*/ { - public: - using Ptr = utils::ObjectPool<Interest>::Ptr; - - Interest(Packet::Format format = HF_INET6_TCP); - - Interest(const Name &interest_name, Packet::Format format = HF_INET6_TCP); + private: + struct InterestManifestHeader { + /* This can be 16 bits, but we use 32 bits for alignment */ + uint32_t n_suffixes; + /* Followed by the list of prefixes to ask */ + /* ... */ + }; - Interest(const uint8_t *buffer, std::size_t size); - Interest(MemBufPtr &&buffer); + public: + using Ptr = std::shared_ptr<Interest>; + + Interest(Packet::Format format = HF_INET6_TCP, + std::size_t additional_header_size = 0); + + Interest(const Name &interest_name, Packet::Format format = HF_INET6_TCP, + std::size_t additional_header_size = 0); + + Interest(MemBuf &&buffer); + + template <typename... Args> + Interest(CopyBufferOp op, Args &&...args) + : Packet(op, std::forward<Args>(args)...) { + if (hicn_interest_get_name(format_, packet_start_, + name_.getStructReference()) < 0) { + throw errors::MalformedPacketException(); + } + } + + template <typename... Args> + Interest(WrapBufferOp op, Args &&...args) + : Packet(op, std::forward<Args>(args)...) { + if (hicn_interest_get_name(format_, packet_start_, + name_.getStructReference()) < 0) { + throw errors::MalformedPacketException(); + } + } + + template <typename... Args> + Interest(CreateOp op, Args &&...args) + : Packet(op, std::forward<Args>(args)...) {} + + /* Move constructor */ + Interest(Interest &&other_interest); - /* - * Enforce zero-copy. - */ - Interest(const Interest &other_interest) = delete; - Interest &operator=(const Interest &other_interest) = delete; + /* Copy constructor */ + Interest(const Interest &other_interest); - Interest(Interest &&other_interest); + /* Assginemnt operator */ + Interest &operator=(const Interest &other); - ~Interest() override; + ~Interest(); const Name &getName() const override; @@ -60,8 +95,21 @@ class Interest uint32_t getLifetime() const override; + bool hasManifest(); + + void appendSuffix(std::uint32_t suffix); + + void encodeSuffixes(); + + uint32_t *firstSuffix(); + + uint32_t numberOfSuffixes(); + + auto shared_from_this() { return utils::shared_from(this); } + private: void resetForHash() override; + std::set<uint32_t> suffix_set_; }; } // end namespace core |