From f4433f28b509a9f67ca85d79000ccf9c2f4b7a24 Mon Sep 17 00:00:00 2001
From: Mauro Sardara <msardara@cisco.com>
Date: Fri, 21 Feb 2020 11:52:28 +0100
Subject: [HICN-534] Major rework on libtransport organization

Change-Id: I361b83a18b4fd59be136d5f0817fc28e17e89884
Signed-off-by: Mauro Sardara <msardara@cisco.com>
---
 libtransport/src/hicn/transport/core/interest.cc | 166 -----------------------
 1 file changed, 166 deletions(-)
 delete mode 100644 libtransport/src/hicn/transport/core/interest.cc

(limited to 'libtransport/src/hicn/transport/core/interest.cc')

diff --git a/libtransport/src/hicn/transport/core/interest.cc b/libtransport/src/hicn/transport/core/interest.cc
deleted file mode 100644
index 166632f0a..000000000
--- a/libtransport/src/hicn/transport/core/interest.cc
+++ /dev/null
@@ -1,166 +0,0 @@
-/*
- * Copyright (c) 2017-2019 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:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include <hicn/transport/core/interest.h>
-#include <hicn/transport/errors/errors.h>
-#include <hicn/transport/utils/hash.h>
-
-extern "C" {
-#ifndef _WIN32
-TRANSPORT_CLANG_DISABLE_WARNING("-Wextern-c-compat")
-#endif
-#include <hicn/hicn.h>
-}
-
-#include <cstring>
-#include <memory>
-
-namespace transport {
-
-namespace core {
-
-Interest::Interest(const Name &interest_name, Packet::Format format)
-    : Packet(format) {
-  if (hicn_interest_set_name(format_, packet_start_,
-                             interest_name.getConstStructReference()) < 0) {
-    throw errors::MalformedPacketException();
-  }
-
-  if (hicn_interest_get_name(format_, packet_start_,
-                             name_.getStructReference()) < 0) {
-    throw errors::MalformedPacketException();
-  }
-}
-
-#ifdef __ANDROID__
-Interest::Interest(hicn_format_t format) : Interest(Name("0::0|0"), format) {}
-#else
-Interest::Interest(hicn_format_t format) : Interest(base_name, format) {}
-#endif
-
-Interest::Interest(const uint8_t *buffer, std::size_t size)
-    : Packet(buffer, size) {
-  if (hicn_interest_get_name(format_, packet_start_,
-                             name_.getStructReference()) < 0) {
-    throw errors::MalformedPacketException();
-  }
-}
-
-Interest::Interest(MemBufPtr &&buffer) : Packet(std::move(buffer)) {
-  if (hicn_interest_get_name(format_, packet_start_,
-                             name_.getStructReference()) < 0) {
-    throw errors::MalformedPacketException();
-  }
-}
-
-Interest::Interest(Interest &&other_interest)
-    : Packet(std::move(other_interest)) {
-  name_ = std::move(other_interest.name_);
-}
-
-Interest::~Interest() {}
-
-void Interest::replace(MemBufPtr &&buffer) {
-  Packet::replace(std::move(buffer));
-
-  if (hicn_interest_get_name(format_, packet_start_,
-                             name_.getStructReference()) < 0) {
-    throw errors::MalformedPacketException();
-  }
-}
-
-const Name &Interest::getName() const {
-  if (!name_) {
-    if (hicn_interest_get_name(format_, packet_start_,
-                               (hicn_name_t *)name_.getConstStructReference()) <
-        0) {
-      throw errors::MalformedPacketException();
-    }
-  }
-
-  return name_;
-}
-
-Name &Interest::getWritableName() { return const_cast<Name &>(getName()); }
-
-void Interest::setName(const Name &name) {
-  if (hicn_interest_set_name(format_, packet_start_,
-                             name.getConstStructReference()) < 0) {
-    throw errors::RuntimeException("Error setting interest name.");
-  }
-
-  if (hicn_interest_get_name(format_, packet_start_,
-                             name_.getStructReference()) < 0) {
-    throw errors::MalformedPacketException();
-  }
-}
-
-void Interest::setName(Name &&name) {
-  if (hicn_interest_set_name(format_, packet_start_,
-                             name.getStructReference()) < 0) {
-    throw errors::RuntimeException("Error setting interest name.");
-  }
-
-  if (hicn_interest_get_name(format_, packet_start_,
-                             name_.getStructReference()) < 0) {
-    throw errors::MalformedPacketException();
-  }
-}
-
-void Interest::setLocator(const ip_address_t &ip_address) {
-  if (hicn_interest_set_locator(format_, packet_start_, &ip_address) < 0) {
-    throw errors::RuntimeException("Error setting interest locator.");
-  }
-
-  return;
-}
-
-ip_address_t Interest::getLocator() const {
-  ip_address_t ip;
-
-  if (hicn_interest_get_locator(format_, packet_start_, &ip) < 0) {
-    throw errors::RuntimeException("Error getting interest locator.");
-  }
-
-  return ip;
-}
-
-void Interest::setLifetime(uint32_t lifetime) {
-  if (hicn_interest_set_lifetime(packet_start_, lifetime) < 0) {
-    throw errors::MalformedPacketException();
-  }
-}
-
-uint32_t Interest::getLifetime() const {
-  uint32_t lifetime = 0;
-
-  if (hicn_interest_get_lifetime(packet_start_, &lifetime) < 0) {
-    throw errors::MalformedPacketException();
-  }
-
-  return lifetime;
-}
-
-void Interest::resetForHash() {
-  if (hicn_interest_reset_for_hash(
-          format_, reinterpret_cast<hicn_header_t *>(packet_start_)) < 0) {
-    throw errors::RuntimeException(
-        "Error resetting interest fields for hash computation.");
-  }
-}
-
-}  // end namespace core
-
-}  // end namespace transport
-- 
cgit 1.2.3-korg