From c46e5df56b67bb8ea7a068d39324c640084ead2b Mon Sep 17 00:00:00 2001 From: Luca Muscariello Date: Wed, 30 Mar 2022 22:29:28 +0200 Subject: feat: boostrap hicn 22.02 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 Co-authored-by: Jordan Augé Co-authored-by: Michele Papalini Co-authored-by: Angelo Mantellini Co-authored-by: Jacques Samain Co-authored-by: Olivier Roques Co-authored-by: Enrico Loparco Co-authored-by: Giulio Grassi Change-Id: I75d0ef70f86d921e3ef503c99271216ff583c215 Signed-off-by: Luca Muscariello Signed-off-by: Mauro Sardara --- libtransport/cmake/Modules/Android.cmake | 19 ----- .../cmake/Modules/DefaultConfiguration.cmake | 30 -------- libtransport/cmake/Modules/Ios.cmake | 20 ----- libtransport/cmake/Modules/Packaging.cmake | 67 ----------------- libtransport/cmake/Modules/TestMacros.cmake | 15 ---- libtransport/cmake/packaging.cmake | 85 ++++++++++++++++++++++ 6 files changed, 85 insertions(+), 151 deletions(-) delete mode 100644 libtransport/cmake/Modules/Android.cmake delete mode 100644 libtransport/cmake/Modules/DefaultConfiguration.cmake delete mode 100644 libtransport/cmake/Modules/Ios.cmake delete mode 100644 libtransport/cmake/Modules/Packaging.cmake delete mode 100644 libtransport/cmake/Modules/TestMacros.cmake create mode 100644 libtransport/cmake/packaging.cmake (limited to 'libtransport/cmake') diff --git a/libtransport/cmake/Modules/Android.cmake b/libtransport/cmake/Modules/Android.cmake deleted file mode 100644 index 78918455a..000000000 --- a/libtransport/cmake/Modules/Android.cmake +++ /dev/null @@ -1,19 +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. - -function (configure_android_environment) - set(CMAKE_CXX_FLAGS " -Wall -stdlib=libc++ -DASIO_STANDALONE -pthread -isystem -lm") - - #set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}" PARENT_SCOPE) - #set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${ANDROID_C_FLAGS}" PARENT_SCOPE) -endfunction() \ No newline at end of file diff --git a/libtransport/cmake/Modules/DefaultConfiguration.cmake b/libtransport/cmake/Modules/DefaultConfiguration.cmake deleted file mode 100644 index 402ad86f5..000000000 --- a/libtransport/cmake/Modules/DefaultConfiguration.cmake +++ /dev/null @@ -1,30 +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. - -# C/c++ standard -set(CMAKE_CXX_STANDARD 17) -set(CMAKE_C_STANDARD 11) - -# Compilation flags - -set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -DDEBUG") -if (NOT WIN32) - set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -fpermissive") - set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "${CMAKE_CXX_FLAGS_RELWITHDEBINFO} -fpermissive") - set(CMAKE_CXX_FLAGS_MINSIZEREL "${CMAKE_CXX_FLAGS_MINSIZEREL} -fpermissive") -endif () - -set(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -DDEBUG") -set(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE}") -set(CMAKE_C_FLAGS_RELWITHDEBINFO "${CMAKE_C_FLAGS_RELWITHDEBINFO}") -set(CMAKE_C_FLAGS_MINSIZEREL "${CMAKE_C_FLAGS_MINSIZEREL}") \ No newline at end of file diff --git a/libtransport/cmake/Modules/Ios.cmake b/libtransport/cmake/Modules/Ios.cmake deleted file mode 100644 index 1b2aae2bf..000000000 --- a/libtransport/cmake/Modules/Ios.cmake +++ /dev/null @@ -1,20 +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. - -function (configure_ios_environment) - find_host_package ( OpenSSL REQUIRED ) - include_directories(extras/iOS) - - find_host_package(Libhicn REQUIRED) - include_directories(${HICN_INCLUDE_DIRS}) -endfunction() \ No newline at end of file diff --git a/libtransport/cmake/Modules/Packaging.cmake b/libtransport/cmake/Modules/Packaging.cmake deleted file mode 100644 index 9ff26aecc..000000000 --- a/libtransport/cmake/Modules/Packaging.cmake +++ /dev/null @@ -1,67 +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. - -# Generate DEB / RPM packages - -###################### -# Packages section -###################### - -set(${LIBTRANSPORT_COMPONENT}_DESCRIPTION -"Libhicn-transport provides transport services and \ -socket API for applications willing to communicate \ -using the hICN protocol stack." - CACHE STRING "Description for deb/rpm package." -) - -set(${LIBTRANSPORT_COMPONENT}-dev_DESCRIPTION - CACHE STRING "Header files for developing using libhicntransport." -) - -set(${LIBTRANSPORT_COMPONENT}-devel_DESCRIPTION - CACHE STRING "Header files for developing using libhicntransport." -) - -set(${LIBTRANSPORT_COMPONENT}-io-modules_DESCRIPTION - CACHE STRING "Additional io modules for libhicntransport, including the memif connector for vpp." -) - -set(${LIBTRANSPORT_COMPONENT}_DEB_DEPENDENCIES - "lib${LIBHICN} (>= stable_version), libparc (>= 1.0), libconfig++9v5 (>= 1.5-0.4build1)" - CACHE STRING "Dependencies for deb/rpm package." -) - -set(${LIBTRANSPORT_COMPONENT}_RPM_DEPENDENCIES - "lib${LIBHICN} >= stable_version, libparc >= 1.0, libconfig >= 1.5-9.el8" - CACHE STRING "Dependencies for deb/rpm package." -) - -set(${LIBTRANSPORT_COMPONENT}-dev_DEB_DEPENDENCIES - "${LIBTRANSPORT_COMPONENT} (>= stable_version), libasio-dev (>= 1.10), lib${LIBHICN}-dev (>= stable_version), libparc-dev (>= 1.0), libconfig++-dev (>= 1.5-0.4build1)" - CACHE STRING "Dependencies for deb/rpm package." -) - -set(${LIBTRANSPORT_COMPONENT}-dev_RPM_DEPENDENCIES - "${LIBTRANSPORT_COMPONENT} >= stable_version, asio-devel >= 1.10, lib${LIBHICN}-devel >= stable_version, libparc-devel >= 1.0, libconfig-devel >= 1.5-9.el8" - CACHE STRING "Dependencies for deb/rpm package." -) - -set(${LIBTRANSPORT_COMPONENT}-io-modules_DEB_DEPENDENCIES - "${LIBTRANSPORT_COMPONENT} (>= stable_version), libmemif (>= stable_version), vpp (>= stable_version-release), vpp (<< next_version-release), hicn-plugin (>= stable_version)" - CACHE STRING "Dependencies for deb/rpm package." -) - -set(${LIBTRANSPORT_COMPONENT}-io-modules_RPM_DEPENDENCIES - "${LIBTRANSPORT_COMPONENT} >= stable_version, libmemif >= stable_version, vpp >= stable_version-release, vpp < next_version-release, hicn-plugin >= stable_version" - CACHE STRING "Dependencies for deb/rpm package." -) diff --git a/libtransport/cmake/Modules/TestMacros.cmake b/libtransport/cmake/Modules/TestMacros.cmake deleted file mode 100644 index 680b5585f..000000000 --- a/libtransport/cmake/Modules/TestMacros.cmake +++ /dev/null @@ -1,15 +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(CTest) - diff --git a/libtransport/cmake/packaging.cmake b/libtransport/cmake/packaging.cmake new file mode 100644 index 000000000..f7f0c27e3 --- /dev/null +++ b/libtransport/cmake/packaging.cmake @@ -0,0 +1,85 @@ +# 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: +# +# 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. + +# Generate DEB / RPM packages + +###################### +# Packages section +###################### + +############################################################## +# Get VPP version +############################################################## +list(GET VPP_DEFAULT_VERSION 0 VPP_VERSION) + +set(${LIBTRANSPORT_COMPONENT}_DESCRIPTION +"Libhicn-transport provides transport services and \ +socket API for applications willing to communicate \ +using the hICN protocol stack." + CACHE STRING "Description for deb/rpm package." +) + +set(${LIBTRANSPORT_COMPONENT}-dev_DESCRIPTION + CACHE STRING "Header files for developing using libhicntransport." +) + +set(lib${LIBTRANSPORT}-devel_DESCRIPTION + CACHE STRING "Header files for developing using libhicntransport." +) + +set(${LIBTRANSPORT_COMPONENT}-io-modules_DESCRIPTION + CACHE STRING "Additional io modules for libhicntransport, including the memif connector for vpp." +) + +set(${LIBTRANSPORT_COMPONENT}_DEB_DEPENDENCIES + "lib${LIBHICN} (= stable_version), libconfig++9v5 (>= 1.5-0.4build1)" + CACHE STRING "Dependencies for deb/rpm package." +) + +set(${LIBTRANSPORT_COMPONENT}_RPM_DEPENDENCIES + "lib${LIBHICN} = stable_version, libconfig >= 1.5-9.el8" + CACHE STRING "Dependencies for deb/rpm package." +) + +set(${LIBTRANSPORT_COMPONENT}-dev_DEB_DEPENDENCIES + "${LIBTRANSPORT_COMPONENT} (= stable_version), libasio-dev (>= 1.10), lib${LIBHICN}-dev (= stable_version), libconfig++-dev (>= 1.5-0.4build1)" + CACHE STRING "Dependencies for deb/rpm package." +) + +set(${LIBTRANSPORT_COMPONENT}-dev_RPM_DEPENDENCIES + "${LIBTRANSPORT_COMPONENT} = stable_version, asio-devel >= 1.10, lib${LIBHICN}-devel = stable_version, libconfig-devel >= 1.5-9.el8" + CACHE STRING "Dependencies for deb/rpm package." +) + +set(${LIBTRANSPORT_COMPONENT}-io-modules_DEB_DEPENDENCIES + "${LIBTRANSPORT_COMPONENT} (= stable_version), vpp (>= ${VPP_VERSION}), hicn-plugin (= stable_version)" + CACHE STRING "Dependencies for deb/rpm package." +) + +set(${LIBTRANSPORT_COMPONENT}-io-modules_RPM_DEPENDENCIES + "${LIBTRANSPORT_COMPONENT} = stable_version, vpp >= ${VPP_VERSION}, hicn-plugin = stable_version" + CACHE STRING "Dependencies for deb/rpm package." +) + +if (INTERNAL_ENVIRONMENT) + include(CheckSsl) + CheckSsl() + set(${LIBTRANSPORT_COMPONENT}_DEB_DEPENDENCIES + "${${LIBTRANSPORT_COMPONENT}_DEB_DEPENDENCIES}, ${OPENSSL_DEPENDENCY}" + CACHE STRING "Dependencies for deb/rpm package." + ) + set(${LIBTRANSPORT_COMPONENT}-dev_DEB_DEPENDENCIES + "${${LIBTRANSPORT_COMPONENT}-dev_DEB_DEPENDENCIES}, ${OPENSSL_DEPENDENCY_DEV}" + CACHE STRING "Dependencies for deb/rpm package." + ) +endif () -- cgit 1.2.3-korg