diff options
| author |   Luca Muscariello <lumuscar@cisco.com> | 2022-06-09 21:34:09 +0200 |
|---|---|---|
| committer |   Luca Muscariello <muscariello@ieee.org> | 2022-06-30 10:47:50 +0200 |
| commit | 6b94663b2455e212009a544ae23bb6a8c55407f8 (patch) | |
| tree | 0af780ce5eeb1009fd24b8af8af08e8368eda3bd /apps/http-proxy | |
| parent | a1ac96f497719b897793ac14b287cb8d840651c1 (diff) | |
refactor(lib, hicn-light, vpp, hiperf): HICN-723
- move infra data structure into the shared lib
- new packet cache using double hashing and lookup on prefix suffix
- testing updates
- authenticated requests using interest manifests
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: Olivier Roques <oroques+fdio@cisco.com>
Co-authored-by: Enrico Loparco <eloparco@cisco.com>
Change-Id: Iaddebfe6aa5279ea8553433b0f519578f6b9ccd9
Signed-off-by: Luca Muscariello <muscariello@ieee.org>
Diffstat (limited to 'apps/http-proxy')
| -rw-r--r-- | apps/http-proxy/includes/hicn/http-proxy/forwarder_interface.h | 8 | ||||
| -rw-r--r-- | apps/http-proxy/includes/hicn/http-proxy/http_session.h | 7 | ||||
| -rw-r--r-- | apps/http-proxy/src/icn_receiver.cc | 6 |
3 files changed, 18 insertions, 3 deletions
diff --git a/apps/http-proxy/includes/hicn/http-proxy/forwarder_interface.h b/apps/http-proxy/includes/hicn/http-proxy/forwarder_interface.h index 1741aedc6..0741099df 100644 --- a/apps/http-proxy/includes/hicn/http-proxy/forwarder_interface.h +++ b/apps/http-proxy/includes/hicn/http-proxy/forwarder_interface.h @@ -23,8 +23,16 @@ extern "C" { #ifndef ASIO_STANDALONE #define ASIO_STANDALONE 1 #endif + +#ifdef __APPLE__ +#pragma clang diagnostic push +#pragma clang diagnostic ignored "-Wshorten-64-to-32" +#endif #include <asio.hpp> #include <asio/steady_timer.hpp> +#ifdef __APPLE__ +#pragma clang diagnostic pop +#endif #include <functional> #include <thread> #include <unordered_map> diff --git a/apps/http-proxy/includes/hicn/http-proxy/http_session.h b/apps/http-proxy/includes/hicn/http-proxy/http_session.h index ee9380a8c..43d10e156 100644 --- a/apps/http-proxy/includes/hicn/http-proxy/http_session.h +++ b/apps/http-proxy/includes/hicn/http-proxy/http_session.h @@ -17,7 +17,14 @@ #include <hicn/transport/core/packet.h> +#ifdef __APPLE__ +#pragma clang diagnostic push +#pragma clang diagnostic ignored "-Wshorten-64-to-32" +#endif #include <asio.hpp> +#ifdef __APPLE__ +#pragma clang diagnostic pop +#endif #include <deque> #include <functional> diff --git a/apps/http-proxy/src/icn_receiver.cc b/apps/http-proxy/src/icn_receiver.cc index 954861e3a..f15851915 100644 --- a/apps/http-proxy/src/icn_receiver.cc +++ b/apps/http-proxy/src/icn_receiver.cc @@ -37,8 +37,8 @@ AsyncConsumerProducer::AsyncConsumerProducer( producer_socket_(), ip_address_(origin_address), port_(origin_port), - cache_size_(std::stoul(cache_size)), - mtu_(std::stoul(mtu)), + cache_size_((uint32_t)std::stoul(cache_size)), + mtu_((uint32_t)std::stoul(mtu)), request_counter_(0), connector_(io_service_, ip_address_, port_, std::bind(&AsyncConsumerProducer::publishContent, this, @@ -59,7 +59,7 @@ AsyncConsumerProducer::AsyncConsumerProducer( } ret = producer_socket_.setSocketOption( - interface::GeneralTransportOptions::MAKE_MANIFEST, manifest); + interface::GeneralTransportOptions::MANIFEST_MAX_CAPACITY, manifest); if (ret != SOCKET_OPTION_SET) { TRANSPORT_LOG_WARNING << "Warning: impossible to enable signatures."; |