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/content_object.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/content_object.h')
-rw-r--r-- | libtransport/includes/hicn/transport/core/content_object.h | 50 |
1 files changed, 41 insertions, 9 deletions
diff --git a/libtransport/includes/hicn/transport/core/content_object.h b/libtransport/includes/hicn/transport/core/content_object.h index 822790e56..805bc814c 100644 --- a/libtransport/includes/hicn/transport/core/content_object.h +++ b/libtransport/includes/hicn/transport/core/content_object.h @@ -17,6 +17,7 @@ #include <hicn/transport/core/name.h> #include <hicn/transport/core/packet.h> +#include <hicn/transport/utils/shared_ptr_utils.h> namespace transport { @@ -27,24 +28,53 @@ namespace core { class ContentObject : public Packet { public: - using Ptr = utils::ObjectPool<ContentObject>::Ptr; + using Ptr = std::shared_ptr<ContentObject>; using HICNContentObject = hicn_header_t; - ContentObject(Packet::Format format = HF_INET6_TCP); + ContentObject(Packet::Format format = HF_INET6_TCP, + std::size_t additional_header_size = 0); - ContentObject(const Name &name, Packet::Format format = HF_INET6_TCP); + ContentObject(const Name &name, Packet::Format format = HF_INET6_TCP, + std::size_t additional_header_size = 0); - ContentObject(const Name &name, hicn_format_t format, const uint8_t *payload, + ContentObject(const Name &name, hicn_format_t format, + std::size_t additional_header_size, const uint8_t *payload, std::size_t payload_size); - ContentObject(const uint8_t *buffer, std::size_t size); - ContentObject(MemBufPtr &&buffer); - - ContentObject(const ContentObject &content_object) = delete; + template <typename... Args> + ContentObject(CopyBufferOp op, Args &&...args) + : Packet(op, std::forward<Args>(args)...) { + if (hicn_data_get_name(format_, packet_start_, name_.getStructReference()) < + 0) { + throw errors::MalformedPacketException(); + } + } + + template <typename... Args> + ContentObject(WrapBufferOp op, Args &&...args) + : Packet(op, std::forward<Args>(args)...) { + if (hicn_data_get_name(format_, packet_start_, name_.getStructReference()) < + 0) { + throw errors::MalformedPacketException(); + } + } + + template <typename... Args> + ContentObject(CreateOp op, Args &&...args) + : Packet(op, std::forward<Args>(args)...) { + if (hicn_data_get_name(format_, packet_start_, name_.getStructReference()) < + 0) { + throw errors::MalformedPacketException(); + } + } + + ContentObject(const ContentObject &content_object); + + ContentObject &operator=(const ContentObject &other); ContentObject(ContentObject &&content_object); - ~ContentObject() override; + ~ContentObject(); const Name &getName() const override; @@ -66,6 +96,8 @@ class ContentObject : public Packet { uint32_t getLifetime() const override; + auto shared_from_this() { return utils::shared_from(this); } + private: void resetForHash() override; }; |