feat: boostrap hicn 22.02

The current patch provides several new features, improvements,
bug fixes and also complete rewrite of entire components.

- lib
The hicn packet parser has been improved with a new packet
format fully based on UDP. The TCP header is still temporarily
supported but the UDP header will replace completely the new hicn
packet format. Improvements have been made to make sure every
packet parsing operation is made via this library. The current
new header can be used as header between the payload and the
UDP header or as trailer in the UDP surplus area to be tested
when UDP options will start to be used.

- hicn-light
The portable packet forwarder has been completely rewritten from
scratch with the twofold objective to improve performance and
code size but  also to drop dependencies such as libparc which is
now removed by the current implementation.

- hicn control
the control library is the agent that is used to program the
packet forwarders via their binary API. This component has
benefited from significant improvements in terms of interaction
model which is now event driven and more robust to failures.

- VPP plugin has been updated to support VPP 22.02

- transport
Major improvement have been made to the RTC protocol, to the
support of IO modules and to the security sub system. Signed
manifests are the default data authenticity and integrity framework.
Confidentiality can be enabled by sharing the encryption key to the
prod/cons layer. The library has been tested with group key based
applications such as broadcast/multicast and real-time on-line
meetings with trusted server keys or MLS.

- testing
Unit testing has been introduced using GoogleTest. One third of
the code base is covered by unit testing with priority on
critical features. Functional testing has also been introduce
using Docker, linux bridging and Robot Framework to define
test with Less Code techniques to facilitate the extension
of the coverage.

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: Angelo Mantellini <manangel@cisco.com>
Co-authored-by: Jacques Samain <jsamain@cisco.com>
Co-authored-by: Olivier Roques <oroques+fdio@cisco.com>
Co-authored-by: Enrico Loparco <eloparco@cisco.com>
Co-authored-by: Giulio Grassi <gigrassi@cisco.com>

Change-Id: I75d0ef70f86d921e3ef503c99271216ff583c215
Signed-off-by: Luca Muscariello <muscariello@ieee.org>
Signed-off-by: Mauro Sardara <msardara@cisco.com>

3 files changed, 237 insertions, 111 deletions

diff --git a/extras/packethicn/CMakeLists.txt b/extras/packethicn/CMakeLists.txt
index cb168ae1f..a4615708a 100644
--- a/extras/packethicn/CMakeLists.txt
+++ b/extras/packethicn/CMakeLists.txt
@@ -1,4 +1,4 @@
-# Copyright (c) 2021 Cisco and/or its affiliates.
+# Copyright (c) 2021-2022 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:
@@ -11,19 +11,39 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-cmake_minimum_required(VERSION 3.5)
+##############################################################
+# Project and cmake version
+##############################################################
+cmake_minimum_required(VERSION 3.10)
 cmake_policy(SET CMP0048 NEW)
-
 project(packethicn VERSION 0.0.1 DESCRIPTION "hICN protocol plugin" LANGUAGES C)
 
+
+##############################################################
+# Cmake modules
+##############################################################
 set(CMAKE_MODULE_PATH
   ${CMAKE_MODULE_PATH}
   ${CMAKE_CURRENT_SOURCE_DIR}/../../cmake/Modules
-  ${CMAKE_CURRENT_SOURCE_DIR}/cmake/Modules
 )
 
+
+##############################################################
+# Naming
+##############################################################
 set(PACKETHICN packethicn)
 
+
+##############################################################
+# Packaging and versioning
+##############################################################
+include(${CMAKE_CURRENT_SOURCE_DIR}/../../versions.cmake)
+include(${CMAKE_CURRENT_SOURCE_DIR}/cmake/packaging.cmake)
+
+
+##############################################################
+# Dependencies and third party libs
+##############################################################
 if(APPLE)
   find_package(Wireshark CONFIG REQUIRED
     PATHS /usr/local/opt/wireshark/lib/wireshark/cmake/ /usr/local/Cellar/wireshark/*/lib/wireshark/cmake
@@ -35,8 +55,21 @@ endif()
 MATH(EXPR Wireshark_PATCH_NEXT_VERSION "${Wireshark_PATCH_VERSION}+1")
 set(Wireshark_NEXT_VERSION ${Wireshark_MAJOR_VERSION}.${Wireshark_MINOR_VERSION}.${Wireshark_PATCH_NEXT_VERSION})
 
+
+##############################################################
+# Check if building as subproject or as root project
+##############################################################
 if(CMAKE_SOURCE_DIR STREQUAL PROJECT_SOURCE_DIR)
-  find_package(Libhicn REQUIRED)
+  include(CommonSetup)
+  find_package(Libhicn ${CURRENT_VERSION} REQUIRED NO_MODULE)
+
+  if (DISABLE_SHARED_LIBRARIES)
+    set(LIBTYPE static)
+  else()
+    set(LIBTYPE shared)
+  endif()
+
+  list(APPEND HICN_LIBRARIES hicn::hicn.${LIBTYPE})
 else()
   if(DISABLE_SHARED_LIBRARIES)
     if(WIN32)
@@ -55,39 +88,56 @@ else()
   endif()
 endif()
 
+
+##############################################################
+# Check if wiresharks supports plugins
+##############################################################
 if(NOT Wireshark_PLUGINS_ENABLED)
   message(FATAL_ERROR "Wireshark was compiled without support for plugins")
 endif()
 
+
+##############################################################
+# Compilaer flags
+##############################################################
 set(CMAKE_C_VISIBILITY_PRESET hidden)
-if (CMAKE_COMPILER_IS_GNUCC)
-  set(CMAKE_C_FLAGS  "-Wall -Wextra ${CMAKE_C_FLAGS}")
-endif()
 
+
+##############################################################
+# Compiler definitions
+##############################################################
 set(COMPILER_DEFINITIONS -DVERSION=\"${PROJECT_VERSION}\")
 
+
+##############################################################
+# Sources
+##############################################################
 set(SOURCE_FILES
   packet-hicn.c
 )
 
+
+##############################################################
+# Include dirs
+##############################################################
 list(APPEND PACKETHICN_INCLUDE_DIRS
   ${HICN_INCLUDE_DIRS}
 )
 
+
+##############################################################
+# Libraries
+##############################################################
 list(APPEND LIBRARIES
   ${HICN_LIBRARIES}
   epan
 )
 
-if(CMAKE_SOURCE_DIR STREQUAL PROJECT_SOURCE_DIR)
-    set(LIBHICN hicn CACHE INTERNAL "" FORCE)
-endif()
-
-include(Packaging)
-include(BuildMacros)
 
+##############################################################
+# Build library
+##############################################################
 build_library(${PACKETHICN}
-  MODULE
   SOURCES ${SOURCE_FILES}
   LINK_LIBRARIES ${LIBRARIES}
   DEPENDS ${DEPENDENCIES}
@@ -95,10 +145,12 @@ build_library(${PACKETHICN}
   INCLUDE_DIRS ${PACKETHICN_INCLUDE_DIRS}
   INSTALL_FULL_PATH_DIR ${Wireshark_PLUGIN_INSTALL_DIR}/epan
   DEFINITIONS ${COMPILER_DEFINITIONS}
-  EMPTY_PREFIX true
 )
 
+
+##############################################################
+# Make package if needed
+##############################################################
 if(CMAKE_SOURCE_DIR STREQUAL PROJECT_SOURCE_DIR)
-    include(Packager)
     make_packages()
 endif()
\ No newline at end of file
diff --git a/extras/packethicn/cmake/Modules/Packaging.cmake b/extras/packethicn/cmake/packaging.cmake
index 5bea05c3c..b7a7f4552 100644
--- a/extras/packethicn/cmake/Modules/Packaging.cmake
+++ b/extras/packethicn/cmake/packaging.cmake
@@ -1,4 +1,4 @@
-# Copyright (c) 2021 Cisco and/or its affiliates.
+# Copyright (c) 2021-2022 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:
@@ -21,11 +21,11 @@ set(${PACKETHICN}_DESCRIPTION
 )
 
 set(${PACKETHICN}_DEB_DEPENDENCIES
-  "lib${LIBHICN} (>= stable_version), wireshark (>= ${Wireshark_VERSION}), wireshark (<< ${Wireshark_NEXT_VERSION})"
+  "lib${LIBHICN} (= stable_version), wireshark (>= ${Wireshark_VERSION}), wireshark (<< ${Wireshark_NEXT_VERSION})"
   CACHE STRING "Dependencies for deb/rpm package."
 )
 
 set(${PACKETHICN}_RPM_DEPENDENCIES
-  "lib${LIBHICN} >= stable_version, wireshark >= ${Wireshark_VERSION}, wireshark < ${Wireshark_NEXT_VERSION}"
+  "lib${LIBHICN} = stable_version, wireshark >= ${Wireshark_VERSION}, wireshark < ${Wireshark_NEXT_VERSION}"
   CACHE STRING "Dependencies for deb/rpm package."
 )
\ No newline at end of file
diff --git a/extras/packethicn/packet-hicn.c b/extras/packethicn/packet-hicn.c
index c17252bb7..87466fdbf 100644
--- a/extras/packethicn/packet-hicn.c
+++ b/extras/packethicn/packet-hicn.c
@@ -17,11 +17,11 @@
 #include <gmodule.h>
 
 #define WS_BUILD_DLL
-#include "ws_symbol_export.h"
 #include "config.h"
+#include "ws_symbol_export.h"
 
-#include "epan/proto.h"
 #include "epan/etypes.h"
+#include "epan/proto.h"
 
 #include <hicn/hicn.h>
 
@@ -36,14 +36,14 @@
 /* TCP-HICN flags */
 #define FLAGS_BITS_LEN 8
 #define FLAGS_MASK 0xFF
-#define TH_FIN  0x01
-#define TH_SYN  0x02
-#define TH_RST  0x04
-#define TH_ACK  0x10
-#define TH_CWR  0x80
-#define TH_ID   0x40
-#define TH_MAN  0x20
-#define TH_SIG  0x08
+#define TH_FIN 0x01
+#define TH_SYN 0x02
+#define TH_RST 0x04
+#define TH_ACK 0x10
+#define TH_CWR 0x80
+#define TH_ID 0x40
+#define TH_MAN 0x20
+#define TH_SIG 0x08
 
 #define HICN_PORT 9695
 
@@ -84,7 +84,6 @@ static gint ett_hicn_l3 = -1;
 static gint ett_hicn_l4 = -1;
 static gint ett_hicn_l4_flags = -1;
 
-
 static uint8_t *_p_hdr = NULL;
 
 bool is_interest(const hicn_header_t *header) {
@@ -97,39 +96,38 @@ bool is_interest(const hicn_header_t *header) {
 
 // TODO: HANDLE ERRORS
 
-hicn_header_t *get_header(tvbuff_t *tvb, const gint offset, const gint length){
+hicn_header_t *get_header(tvbuff_t *tvb, const gint offset, const gint length) {
   tvb_ensure_bytes_exist(tvb, offset, length);
-  hicn_header_t *pkt_hdr = (hicn_header_t *) tvb_get_ptr(tvb, offset, length);
-  _p_hdr = (uint8_t *) pkt_hdr;
+  hicn_header_t *pkt_hdr = (hicn_header_t *)tvb_get_ptr(tvb, offset, length);
+  _p_hdr = (uint8_t *)pkt_hdr;
   return pkt_hdr;
 }
 
-uint32_t get_offset(uint8_t *data_addr){
-  return data_addr - _p_hdr;
-}
+uint32_t get_offset(uint8_t *data_addr) { return data_addr - _p_hdr; }
 
-static int
-dissect_hicn(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _U_)
-{
+static int dissect_hicn(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree,
+                        void *data _U_) {
   gint i = 0;
   guint bpos;
 
   hicn_header_t *pkt_hdr = get_header(tvb, 0, HICN_V6_TCP_HDRLEN);
 
   wmem_strbuf_t *flags_strbuf = wmem_strbuf_new_label(wmem_packet_scope());
-  static const gchar *flags[] = {"_FIN", "_SYN", "_RST", "SIG", "_ACK", "MAN", "ID", "_CWR"};
+  static const gchar *flags[] = {"_FIN", "_SYN", "_RST", "SIG",
+                                 "_ACK", "MAN",  "ID",   "_CWR"};
   wmem_strbuf_append(flags_strbuf, "<None>");
 
-  uint32_t flags_offset = get_offset((uint8_t *) &(pkt_hdr->v6.tcp.flags));
+  uint32_t flags_offset = get_offset((uint8_t *)&(pkt_hdr->v6.tcp.flags));
 
   gboolean first_flag = TRUE;
-  for(i=0; i<9; i++) {
+  for (i = 0; i < 9; i++) {
     bpos = 1 << i;
-    if(pkt_hdr->v6.tcp.flags & bpos) {
-      if(first_flag) {
+    if (pkt_hdr->v6.tcp.flags & bpos) {
+      if (first_flag) {
         wmem_strbuf_truncate(flags_strbuf, 0);
       }
-      wmem_strbuf_append_printf(flags_strbuf, "%s%s", first_flag ? "" : ", ", flags[i]);
+      wmem_strbuf_append_printf(flags_strbuf, "%s%s", first_flag ? "" : ", ",
+                                flags[i]);
       first_flag = FALSE;
     }
   }
@@ -138,99 +136,176 @@ dissect_hicn(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _U_
   col_set_str(pinfo->cinfo, COL_PROTOCOL, "HICN");
   col_clear(pinfo->cinfo, COL_INFO);
 
-  proto_item *ti = proto_tree_add_item(tree, proto_hicn, tvb, 0, HICN_V6_TCP_HDRLEN, ENC_NA);
+  proto_item *ti =
+      proto_tree_add_item(tree, proto_hicn, tvb, 0, HICN_V6_TCP_HDRLEN, ENC_NA);
   proto_tree *hicn_tree = proto_item_add_subtree(ti, ett_hicn);
 
   // L3
   proto_item *ti_l3;
-  proto_tree *hicn_l3_tree = proto_tree_add_subtree(hicn_tree, tvb, 0, IPV6_HDRLEN, ett_hicn_l3, &ti_l3, "HICN Layer 3");
+  proto_tree *hicn_l3_tree = proto_tree_add_subtree(
+      hicn_tree, tvb, 0, IPV6_HDRLEN, ett_hicn_l3, &ti_l3, "HICN Layer 3");
 
-  if(is_interest(pkt_hdr)){
+  if (is_interest(pkt_hdr)) {
     proto_item_append_text(ti, ", Interest Packet");
     col_set_str(pinfo->cinfo, COL_INFO, "Interest Packet");
-    proto_tree_add_item(hicn_l3_tree, hf_hicn_ipv6_src, tvb, get_offset((uint8_t *) &(pkt_hdr->v6.ip.saddr)), sizeof(pkt_hdr->v6.ip.saddr), ENC_BIG_ENDIAN);
-    proto_tree_add_item(hicn_l3_tree, hf_hicn_ipv6_dst_interest, tvb, get_offset((uint8_t *) &(pkt_hdr->v6.ip.daddr)), sizeof(pkt_hdr->v6.ip.daddr), ENC_BIG_ENDIAN);
+    proto_tree_add_item(hicn_l3_tree, hf_hicn_ipv6_src, tvb,
+                        get_offset((uint8_t *)&(pkt_hdr->v6.ip.saddr)),
+                        sizeof(pkt_hdr->v6.ip.saddr), ENC_BIG_ENDIAN);
+    proto_tree_add_item(hicn_l3_tree, hf_hicn_ipv6_dst_interest, tvb,
+                        get_offset((uint8_t *)&(pkt_hdr->v6.ip.daddr)),
+                        sizeof(pkt_hdr->v6.ip.daddr), ENC_BIG_ENDIAN);
   } else {
     // TODO: NEW LABEL FOR NACKS
     proto_item_append_text(ti, ", Data Packet");
     col_set_str(pinfo->cinfo, COL_INFO, "Data Packet");
-    proto_tree_add_item(hicn_l3_tree, hf_hicn_ipv6_src_data, tvb, get_offset((uint8_t *) &(pkt_hdr->v6.ip.saddr)), sizeof(pkt_hdr->v6.ip.saddr), ENC_BIG_ENDIAN);
-    proto_tree_add_item(hicn_l3_tree, hf_hicn_ipv6_dst, tvb, get_offset((uint8_t *) &(pkt_hdr->v6.ip.daddr)), sizeof(pkt_hdr->v6.ip.daddr), ENC_BIG_ENDIAN);
+    proto_tree_add_item(hicn_l3_tree, hf_hicn_ipv6_src_data, tvb,
+                        get_offset((uint8_t *)&(pkt_hdr->v6.ip.saddr)),
+                        sizeof(pkt_hdr->v6.ip.saddr), ENC_BIG_ENDIAN);
+    proto_tree_add_item(hicn_l3_tree, hf_hicn_ipv6_dst, tvb,
+                        get_offset((uint8_t *)&(pkt_hdr->v6.ip.daddr)),
+                        sizeof(pkt_hdr->v6.ip.daddr), ENC_BIG_ENDIAN);
   }
 
   // L4
   proto_item *ti_l4;
-  proto_tree *hicn_l4_tree = proto_tree_add_subtree(hicn_tree, tvb, IPV6_HDRLEN, TCP_HDRLEN, ett_hicn_l4, &ti_l4, "HICN Layer 4");
-
-  proto_tree_add_item(hicn_l4_tree, hf_hicn_tcp_namesuffix, tvb, get_offset((uint8_t *) &(pkt_hdr->v6.tcp.name_suffix)), sizeof(pkt_hdr->v6.tcp.name_suffix), ENC_BIG_ENDIAN);
-  proto_tree_add_item(hicn_l4_tree, hf_hicn_tcp_pathlabel, tvb, get_offset((uint8_t *) &(pkt_hdr->v6.tcp.pathlabel))+PATHLABEL_PAD_LEN, sizeof(pkt_hdr->v6.tcp.pathlabel), ENC_BIG_ENDIAN);
-  proto_item *ti_l4_ts = proto_tree_add_bits_item(hicn_l4_tree, hf_hicn_tcp_timescale, tvb,
-    get_offset((uint8_t *) &(pkt_hdr->v6.tcp.data_offset_and_reserved))*8 + TIMESCALE_BITS_OFFSET, TIMESCALE_BITS_LENGTH, ENC_BIG_ENDIAN);
-  proto_item_append_text(ti_l4_ts, " (Lifetime scaling factor: %dx)", pkt_hdr->v6.tcp.timescale+1);
-  proto_item *hicn_l4_flags_tree = proto_tree_add_uint_format_value(hicn_l4_tree, hf_hicn_tcp_flags, tvb,
-    get_offset((uint8_t *) &(pkt_hdr->v6.tcp.flags)), 1, pkt_hdr->v6.tcp.flags, "0x%02x (%s)", pkt_hdr->v6.tcp.flags, wmem_strbuf_get_str(flags_strbuf)
-  );
-  proto_tree *field_tree = proto_item_add_subtree(hicn_l4_flags_tree, ett_hicn_l4_flags);
-  proto_tree_add_boolean(field_tree, hf_hicn_tcp_flags_cwr, tvb, flags_offset, 1, pkt_hdr->v6.tcp.flags);
-  proto_tree_add_boolean(field_tree, hf_hicn_tcp_flags_id, tvb, flags_offset, 1, pkt_hdr->v6.tcp.flags);
-  proto_tree_add_boolean(field_tree, hf_hicn_tcp_flags_man, tvb, flags_offset, 1, pkt_hdr->v6.tcp.flags);
-  proto_tree_add_boolean(field_tree, hf_hicn_tcp_flags_ack, tvb, flags_offset, 1, pkt_hdr->v6.tcp.flags);
-  proto_tree_add_boolean(field_tree, hf_hicn_tcp_flags_sig, tvb, flags_offset, 1, pkt_hdr->v6.tcp.flags);
-  proto_tree_add_boolean(field_tree, hf_hicn_tcp_flags_rst, tvb, flags_offset, 1, pkt_hdr->v6.tcp.flags);
-  proto_tree_add_boolean(field_tree, hf_hicn_tcp_flags_syn, tvb, flags_offset, 1, pkt_hdr->v6.tcp.flags);
-  proto_tree_add_boolean(field_tree, hf_hicn_tcp_flags_fin, tvb, flags_offset, 1, pkt_hdr->v6.tcp.flags);
-  proto_tree_add_item(hicn_l4_tree, hf_hicn_tcp_ldr, tvb, get_offset((uint8_t *) &(pkt_hdr->v6.tcp.ldr)), sizeof(pkt_hdr->v6.tcp.ldr), ENC_BIG_ENDIAN);
-  proto_tree_add_item(hicn_l4_tree, hf_hicn_tcp_csum, tvb, get_offset((uint8_t *) &(pkt_hdr->v6.tcp.csum)), sizeof(pkt_hdr->v6.tcp.ldr), ENC_BIG_ENDIAN);
-  proto_item *ti_l4_lt = proto_tree_add_item(hicn_l4_tree, hf_hicn_tcp_lifetime, tvb, get_offset((uint8_t *) &(pkt_hdr->v6.tcp.lifetime)), sizeof(pkt_hdr->v6.tcp.ldr), ENC_BIG_ENDIAN);
+  proto_tree *hicn_l4_tree =
+      proto_tree_add_subtree(hicn_tree, tvb, IPV6_HDRLEN, TCP_HDRLEN,
+                             ett_hicn_l4, &ti_l4, "HICN Layer 4");
+
+  proto_tree_add_item(hicn_l4_tree, hf_hicn_tcp_namesuffix, tvb,
+                      get_offset((uint8_t *)&(pkt_hdr->v6.tcp.name_suffix)),
+                      sizeof(pkt_hdr->v6.tcp.name_suffix), ENC_BIG_ENDIAN);
+  proto_tree_add_item(hicn_l4_tree, hf_hicn_tcp_pathlabel, tvb,
+                      get_offset((uint8_t *)&(pkt_hdr->v6.tcp.pathlabel)) +
+                          PATHLABEL_PAD_LEN,
+                      sizeof(pkt_hdr->v6.tcp.pathlabel), ENC_BIG_ENDIAN);
+  proto_item *ti_l4_ts = proto_tree_add_bits_item(
+      hicn_l4_tree, hf_hicn_tcp_timescale, tvb,
+      get_offset((uint8_t *)&(pkt_hdr->v6.tcp.data_offset_and_reserved)) * 8 +
+          TIMESCALE_BITS_OFFSET,
+      TIMESCALE_BITS_LENGTH, ENC_BIG_ENDIAN);
+  proto_item_append_text(ti_l4_ts, " (Lifetime scaling factor: %dx)",
+                         pkt_hdr->v6.tcp.timescale + 1);
+  proto_item *hicn_l4_flags_tree = proto_tree_add_uint_format_value(
+      hicn_l4_tree, hf_hicn_tcp_flags, tvb,
+      get_offset((uint8_t *)&(pkt_hdr->v6.tcp.flags)), 1, pkt_hdr->v6.tcp.flags,
+      "0x%02x (%s)", pkt_hdr->v6.tcp.flags, wmem_strbuf_get_str(flags_strbuf));
+  proto_tree *field_tree =
+      proto_item_add_subtree(hicn_l4_flags_tree, ett_hicn_l4_flags);
+  proto_tree_add_boolean(field_tree, hf_hicn_tcp_flags_cwr, tvb, flags_offset,
+                         1, pkt_hdr->v6.tcp.flags);
+  proto_tree_add_boolean(field_tree, hf_hicn_tcp_flags_id, tvb, flags_offset, 1,
+                         pkt_hdr->v6.tcp.flags);
+  proto_tree_add_boolean(field_tree, hf_hicn_tcp_flags_man, tvb, flags_offset,
+                         1, pkt_hdr->v6.tcp.flags);
+  proto_tree_add_boolean(field_tree, hf_hicn_tcp_flags_ack, tvb, flags_offset,
+                         1, pkt_hdr->v6.tcp.flags);
+  proto_tree_add_boolean(field_tree, hf_hicn_tcp_flags_sig, tvb, flags_offset,
+                         1, pkt_hdr->v6.tcp.flags);
+  proto_tree_add_boolean(field_tree, hf_hicn_tcp_flags_rst, tvb, flags_offset,
+                         1, pkt_hdr->v6.tcp.flags);
+  proto_tree_add_boolean(field_tree, hf_hicn_tcp_flags_syn, tvb, flags_offset,
+                         1, pkt_hdr->v6.tcp.flags);
+  proto_tree_add_boolean(field_tree, hf_hicn_tcp_flags_fin, tvb, flags_offset,
+                         1, pkt_hdr->v6.tcp.flags);
+  proto_tree_add_item(hicn_l4_tree, hf_hicn_tcp_ldr, tvb,
+                      get_offset((uint8_t *)&(pkt_hdr->v6.tcp.ldr)),
+                      sizeof(pkt_hdr->v6.tcp.ldr), ENC_BIG_ENDIAN);
+  proto_tree_add_item(hicn_l4_tree, hf_hicn_tcp_csum, tvb,
+                      get_offset((uint8_t *)&(pkt_hdr->v6.tcp.csum)),
+                      sizeof(pkt_hdr->v6.tcp.ldr), ENC_BIG_ENDIAN);
+  proto_item *ti_l4_lt =
+      proto_tree_add_item(hicn_l4_tree, hf_hicn_tcp_lifetime, tvb,
+                          get_offset((uint8_t *)&(pkt_hdr->v6.tcp.lifetime)),
+                          sizeof(pkt_hdr->v6.tcp.ldr), ENC_BIG_ENDIAN);
   proto_item_append_text(ti_l4_lt, " milliseconds");
 
   dissector_handle_t data_handle = find_dissector("data");
-  call_dissector(data_handle, tvb_new_subset_remaining(tvb, HICN_V6_TCP_HDRLEN), pinfo, tree);
+  call_dissector(data_handle, tvb_new_subset_remaining(tvb, HICN_V6_TCP_HDRLEN),
+                 pinfo, tree);
   return tvb_captured_length(tvb);
 }
 
-static void
-proto_register_hicn(void)
-{
+static void proto_register_hicn(void) {
   static hf_register_info hf[] = {
-    { &hf_hicn_ipv6_src, { "Source Address", "hicn.l3.src", FT_IPv6, BASE_NONE, NULL, 0x0, NULL, HFILL }},
-    { &hf_hicn_ipv6_src_data, { "Name Prefix", "hicn.l3.src", FT_IPv6, BASE_NONE, NULL, 0x0, NULL, HFILL }},
-    { &hf_hicn_ipv6_dst, { "Destination Address", "hicn.l3.dst", FT_IPv6, BASE_NONE, NULL, 0x0, NULL, HFILL }},
-    { &hf_hicn_ipv6_dst_interest, { "Name Prefix", "hicn.l3.dst", FT_IPv6, BASE_NONE, NULL, 0x0, NULL, HFILL }},
-    { &hf_hicn_tcp_namesuffix, { "Name Suffix", "hicn.l4.namesuffix", FT_UINT32, BASE_HEX_DEC , NULL, 0x0, NULL, HFILL }},
-    { &hf_hicn_tcp_pathlabel, { "Path Label", "hicn.l4.pathlabel", FT_UINT8, BASE_HEX_DEC , NULL, 0x0, NULL, HFILL }},
-    { &hf_hicn_tcp_hdrlen_timescale, { "Header length and Timescale", "hicn.l4.hdrlen_ts", FT_UINT8, BASE_HEX, NULL, 0x0, NULL, HFILL }},
-    { &hf_hicn_tcp_hdrlen, { "Header length", "hicn.l4.hdrlen", FT_UINT8, BASE_DEC, NULL, 0x0, NULL, HFILL }},
-    { &hf_hicn_tcp_timescale, { "Timescale", "hicn.l4.timescale", FT_UINT8, BASE_DEC, NULL, 0x0, NULL, HFILL }},
-    { &hf_hicn_tcp_flags, { "Flags", "hicn.l4.flags", FT_UINT8, BASE_HEX, NULL, FLAGS_MASK, NULL, HFILL }},
-    { &hf_hicn_tcp_flags_cwr, { "_CWR", "hicn.l4.flags.cwr", FT_BOOLEAN, FLAGS_BITS_LEN, TFS(&tfs_set_notset), TH_CWR, NULL, HFILL }},
-    { &hf_hicn_tcp_flags_id, { "ID", "hicn.l4.flags.id", FT_BOOLEAN, FLAGS_BITS_LEN, TFS(&tfs_set_notset),TH_ID, NULL, HFILL }},
-    { &hf_hicn_tcp_flags_man, { "MAN", "hicn.l4.flags.man", FT_BOOLEAN, FLAGS_BITS_LEN, TFS(&tfs_set_notset), TH_MAN, NULL, HFILL }},
-    { &hf_hicn_tcp_flags_ack, { "_ACK", "hicn.l4.flags.ack", FT_BOOLEAN, FLAGS_BITS_LEN, TFS(&tfs_set_notset), TH_ACK, NULL, HFILL }},
-    { &hf_hicn_tcp_flags_sig, { "SIG", "hicn.l4.flags.sig", FT_BOOLEAN, FLAGS_BITS_LEN, TFS(&tfs_set_notset), TH_SIG, NULL, HFILL }},
-    { &hf_hicn_tcp_flags_rst, { "_RST", "hicn.l4.flags.reset", FT_BOOLEAN, FLAGS_BITS_LEN, TFS(&tfs_set_notset), TH_RST, NULL, HFILL }},
-    { &hf_hicn_tcp_flags_syn, { "_SYN", "hicn.l4.flags.syn", FT_BOOLEAN, FLAGS_BITS_LEN, TFS(&tfs_set_notset), TH_SYN, NULL, HFILL }},
-    { &hf_hicn_tcp_flags_fin, { "_FIN", "hicn.l4.flags.fin", FT_BOOLEAN, FLAGS_BITS_LEN, TFS(&tfs_set_notset), TH_FIN, NULL, HFILL }},
-    { &hf_hicn_tcp_ldr, { "Loss Detection and Recovery", "hicn.l4.ldr", FT_UINT16, BASE_HEX , NULL, 0x0, NULL, HFILL }},
-    { &hf_hicn_tcp_csum, { "Checksum", "hicn.l4.csum", FT_UINT16, BASE_HEX , NULL, 0x0, NULL, HFILL }},
-    { &hf_hicn_tcp_lifetime, { "Lifetime", "hicn.l4.lifetime", FT_UINT16, BASE_DEC , NULL, 0x0, NULL, HFILL }}
-  };
+      {&hf_hicn_ipv6_src,
+       {"Source Address", "hicn.l3.src", FT_IPv6, BASE_NONE, NULL, 0x0, NULL,
+        HFILL}},
+      {&hf_hicn_ipv6_src_data,
+       {"Name Prefix", "hicn.l3.src", FT_IPv6, BASE_NONE, NULL, 0x0, NULL,
+        HFILL}},
+      {&hf_hicn_ipv6_dst,
+       {"Destination Address", "hicn.l3.dst", FT_IPv6, BASE_NONE, NULL, 0x0,
+        NULL, HFILL}},
+      {&hf_hicn_ipv6_dst_interest,
+       {"Name Prefix", "hicn.l3.dst", FT_IPv6, BASE_NONE, NULL, 0x0, NULL,
+        HFILL}},
+      {&hf_hicn_tcp_namesuffix,
+       {"Name Suffix", "hicn.l4.namesuffix", FT_UINT32, BASE_HEX_DEC, NULL, 0x0,
+        NULL, HFILL}},
+      {&hf_hicn_tcp_pathlabel,
+       {"Path Label", "hicn.l4.pathlabel", FT_UINT8, BASE_HEX_DEC, NULL, 0x0,
+        NULL, HFILL}},
+      {&hf_hicn_tcp_hdrlen_timescale,
+       {"Header length and Timescale", "hicn.l4.hdrlen_ts", FT_UINT8, BASE_HEX,
+        NULL, 0x0, NULL, HFILL}},
+      {&hf_hicn_tcp_hdrlen,
+       {"Header length", "hicn.l4.hdrlen", FT_UINT8, BASE_DEC, NULL, 0x0, NULL,
+        HFILL}},
+      {&hf_hicn_tcp_timescale,
+       {"Timescale", "hicn.l4.timescale", FT_UINT8, BASE_DEC, NULL, 0x0, NULL,
+        HFILL}},
+      {&hf_hicn_tcp_flags,
+       {"Flags", "hicn.l4.flags", FT_UINT8, BASE_HEX, NULL, FLAGS_MASK, NULL,
+        HFILL}},
+      {&hf_hicn_tcp_flags_cwr,
+       {"_CWR", "hicn.l4.flags.cwr", FT_BOOLEAN, FLAGS_BITS_LEN,
+        TFS(&tfs_set_notset), TH_CWR, NULL, HFILL}},
+      {&hf_hicn_tcp_flags_id,
+       {"ID", "hicn.l4.flags.id", FT_BOOLEAN, FLAGS_BITS_LEN,
+        TFS(&tfs_set_notset), TH_ID, NULL, HFILL}},
+      {&hf_hicn_tcp_flags_man,
+       {"MAN", "hicn.l4.flags.man", FT_BOOLEAN, FLAGS_BITS_LEN,
+        TFS(&tfs_set_notset), TH_MAN, NULL, HFILL}},
+      {&hf_hicn_tcp_flags_ack,
+       {"_ACK", "hicn.l4.flags.ack", FT_BOOLEAN, FLAGS_BITS_LEN,
+        TFS(&tfs_set_notset), TH_ACK, NULL, HFILL}},
+      {&hf_hicn_tcp_flags_sig,
+       {"SIG", "hicn.l4.flags.sig", FT_BOOLEAN, FLAGS_BITS_LEN,
+        TFS(&tfs_set_notset), TH_SIG, NULL, HFILL}},
+      {&hf_hicn_tcp_flags_rst,
+       {"_RST", "hicn.l4.flags.reset", FT_BOOLEAN, FLAGS_BITS_LEN,
+        TFS(&tfs_set_notset), TH_RST, NULL, HFILL}},
+      {&hf_hicn_tcp_flags_syn,
+       {"_SYN", "hicn.l4.flags.syn", FT_BOOLEAN, FLAGS_BITS_LEN,
+        TFS(&tfs_set_notset), TH_SYN, NULL, HFILL}},
+      {&hf_hicn_tcp_flags_fin,
+       {"_FIN", "hicn.l4.flags.fin", FT_BOOLEAN, FLAGS_BITS_LEN,
+        TFS(&tfs_set_notset), TH_FIN, NULL, HFILL}},
+      {&hf_hicn_tcp_ldr,
+       {"Loss Detection and Recovery", "hicn.l4.ldr", FT_UINT16, BASE_HEX, NULL,
+        0x0, NULL, HFILL}},
+      {&hf_hicn_tcp_csum,
+       {"Checksum", "hicn.l4.csum", FT_UINT16, BASE_HEX, NULL, 0x0, NULL,
+        HFILL}},
+      {&hf_hicn_tcp_lifetime,
+       {"Lifetime", "hicn.l4.lifetime", FT_UINT16, BASE_DEC, NULL, 0x0, NULL,
+        HFILL}}};
 
   static gint *ett[] = {
-    &ett_hicn,
-    &ett_hicn_l3,
-    &ett_hicn_l4,
-    &ett_hicn_l4_flags,
+      &ett_hicn,
+      &ett_hicn_l3,
+      &ett_hicn_l4,
+      &ett_hicn_l4_flags,
   };
 
-  proto_hicn = proto_register_protocol ("Hybrid Information-Centric Networking Protocol", "HICN", "hicn");
+  proto_hicn = proto_register_protocol(
+      "Hybrid Information-Centric Networking Protocol", "HICN", "hicn");
   proto_register_field_array(proto_hicn, hf, array_length(hf));
   proto_register_subtree_array(ett, array_length(ett));
 }
 
-static void
-proto_reg_handoff_hicn(void)
-{
+static void proto_reg_handoff_hicn(void) {
   static dissector_handle_t hicn_handle;
 
   hicn_handle = create_dissector_handle(dissect_hicn, proto_hicn);
@@ -239,8 +314,7 @@ proto_reg_handoff_hicn(void)
   dissector_add_uint("ethertype", ETHERTYPE_IPv6, hicn_handle);
 }
 
-void plugin_register(void)
-{
+void plugin_register(void) {
   static proto_plugin plug_hicn;
   plug_hicn.register_protoinfo = proto_register_hicn;
   plug_hicn.register_handoff = proto_reg_handoff_hicn;