From 1fc9a18f95fd2ff491679e4c8de519afe49d8c47 Mon Sep 17 00:00:00 2001 From: Mauro Sardara Date: Mon, 20 Apr 2020 12:55:28 +0200 Subject: [HICN-598] [HICN-599] Fix hicn_name_t definition conflicts. Change-Id: Ica8db44e27c3a4911ea869e91f96b781809373d8 Signed-off-by: Mauro Sardara --- libtransport/src/implementation/socket_producer.h | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) (limited to 'libtransport/src/implementation/socket_producer.h') diff --git a/libtransport/src/implementation/socket_producer.h b/libtransport/src/implementation/socket_producer.h index a6f0f969e..574723607 100644 --- a/libtransport/src/implementation/socket_producer.h +++ b/libtransport/src/implementation/socket_producer.h @@ -134,16 +134,12 @@ class ProducerSocket : public Socket, core::Packet::Format hf_format = core::Packet::Format::HF_UNSPEC; core::Packet::Format hf_format_ah = core::Packet::Format::HF_UNSPEC; - if (content_name.getType() == HNT_CONTIGUOUS_V4 || - content_name.getType() == HNT_IOV_V4) { + if (content_name.isIp4()) { hf_format = core::Packet::Format::HF_INET_TCP; hf_format_ah = core::Packet::Format::HF_INET_TCP_AH; - } else if (content_name.getType() == HNT_CONTIGUOUS_V6 || - content_name.getType() == HNT_IOV_V6) { + } else { hf_format = core::Packet::Format::HF_INET6_TCP; hf_format_ah = core::Packet::Format::HF_INET6_TCP_AH; - } else { - throw errors::RuntimeException("Unknown name format."); } format = hf_format; -- cgit 1.2.3-korg