diff options
author | Luca Muscariello <muscariello@ieee.org> | 2022-08-04 16:06:34 +0200 |
---|---|---|
committer | Luca Muscariello <muscariello@ieee.org> | 2022-08-04 16:31:51 +0200 |
commit | 6d22a0db96aa7f8e3102ae44d00c09e36a2e9c57 (patch) | |
tree | 79546bbf09f6fbf74db7bc89117843f06ce937ea /internal/cmake/Modules | |
parent | 012843b1c0bc0838e69085ed83a79ec8b6f97360 (diff) |
feat: Due to the deep modifications related to names and packet format,
this task cover a large part of the codebase and involves several changes:
- the library provides a name data structure (hicn_name_t ), which is composed
of a name prefix (hicn_name_prefix_t) and a name suffix (hicn_name_suffix_t),
and it has been extended to provide all support functions required for name
manipulation, including common prefix computation, as required for the Longest
Prefix Match (LPM)in the forwarder, in addition to Exact Prefix Match (EPM).
- all code has been rewritten to use this data structure instead of having for
instance the forwarder define its own name class (used to be Name and NameBitVector)
the code has been refactored to minimize name allocations and copies, one remaining
aspect is the difference of name storage between PIT and CS entries (respectively
in the PIT entry, and in the message buffer), which causes the packet cache
index to be updated when a PIT entry is converted into a CS entry. By storing
the name in the PIT/CS entry everytime, we might save on this operation).
- hicn-light FIB has been rewritten : code has been refactored and should now be
shorter and documented; unit tests have been drafted but more would be required
to cover all cases and match the algorithms to add/remove nodes, as specified in the doc.
all protocol details and hICN header formats are now abstracted by the library
for the forwarder (and thus header.h and protocols/*.h have been removed from
public includes, and replaced by packet.h providing protocol agnostic packet
level functions, completely replacing the compat.h header that used to provide
similar functions.
- this works by exposing a opaque buffer to the application (a kind of socket buffer)
which is used by the lib to cache the packet format and offsets of the different
layers in the buffer and provider efficient operations (the packet format is
either defined for packet construction, or guessed at ingress, and this structure
is updated accordingly only once).
Co-authored-by: Jordan Augé <jordan.auge+fdio@cisco.com>
Signed-off-by: Luca Muscariello <muscariello@ieee.org>
Change-Id: I31e321897f85f0267fe8ba4720363c180564492f
Diffstat (limited to 'internal/cmake/Modules')
-rw-r--r-- | internal/cmake/Modules/CheckSafeC.cmake | 18 | ||||
-rw-r--r-- | internal/cmake/Modules/CheckSsl.cmake | 19 | ||||
-rw-r--r-- | internal/cmake/Modules/FindCiscoSafeC.cmake | 54 | ||||
-rw-r--r-- | internal/cmake/Modules/ImportInternal.cmake | 23 | ||||
-rw-r--r-- | internal/cmake/Modules/SetRelyGitRepo.cmake | 20 |
5 files changed, 134 insertions, 0 deletions
diff --git a/internal/cmake/Modules/CheckSafeC.cmake b/internal/cmake/Modules/CheckSafeC.cmake new file mode 100644 index 000000000..fe0b996bd --- /dev/null +++ b/internal/cmake/Modules/CheckSafeC.cmake @@ -0,0 +1,18 @@ +# Copyright (c) 2017-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. + +macro(CheckSafeC) + if(INTERNAL_ENVIRONMENT_FOUND) + set(SAFEC_DEPENDENCY "ciscosafec") + endif() +endmacro()
\ No newline at end of file diff --git a/internal/cmake/Modules/CheckSsl.cmake b/internal/cmake/Modules/CheckSsl.cmake new file mode 100644 index 000000000..bf1b11737 --- /dev/null +++ b/internal/cmake/Modules/CheckSsl.cmake @@ -0,0 +1,19 @@ +# Copyright (c) 2017-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. + +macro(CheckSsl) + if("${OPENSSL_INCLUDE_DIR}" MATCHES ".*cisco.*") + set(OPENSSL_DEPENDENCY "tk-libssl1.1") + set(OPENSSL_DEPENDENCY_DEV "tk-libssl-dev") + endif() +endmacro()
\ No newline at end of file diff --git a/internal/cmake/Modules/FindCiscoSafeC.cmake b/internal/cmake/Modules/FindCiscoSafeC.cmake new file mode 100644 index 000000000..9f723a018 --- /dev/null +++ b/internal/cmake/Modules/FindCiscoSafeC.cmake @@ -0,0 +1,54 @@ +# Copyright (c) 2017-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. + +######################################## +# +# Find the CiscoSafeC libraries and includes +# This module sets: +# CISCOSAFEC_FOUND: True if CiscoSafeC was found +# CISCOSAFEC_LIBRARY: The CiscoSafeC library +# CISCOSAFEC_LIBRARIES: The CiscoSafeC library and dependencies +# CISCOSAFEC_INCLUDE_DIR: The CiscoSafeC include dir +# + +set(CISCOSAFEC_SEARCH_PATH_LIST + ${CISCOSAFEC_HOME} + $ENV{CISCOSAFEC_HOME} + /usr/local + /opt + /usr +) + +find_path(CISCOSAFEC_INCLUDE_DIR safec_config.h + HINTS ${CISCOSAFEC_SEARCH_PATH_LIST} + PATH_SUFFIXES include include/safec + DOC "Find the CiscoSafeC includes" +) + +find_library(CISCOSAFEC_LIBRARY NAMES ciscosafec + HINTS ${CISCOSAFEC_SEARCH_PATH_LIST} + PATH_SUFFIXES lib + DOC "Find the CiscoSafeC libraries" +) + +set(CISCOSAFEC_LIBRARIES ${CISCOSAFEC_LIBRARY}) +set(CISCOSAFEC_INCLUDE_DIRS ${CISCOSAFEC_INCLUDE_DIR}) + +include(FindPackageHandleStandardArgs) +set(CISCOSAFEC_FOUND False) + +if (NOT "${CISCOSAFEC_INCLUDE_DIR}" STREQUAL "") + set(CISCOSAFEC_FOUND True) + find_package_handle_standard_args(CiscoSafeC DEFAULT_MSG CISCOSAFEC_LIBRARY CISCOSAFEC_INCLUDE_DIR) + mark_as_advanced(CISCOSAFEC_LIBRARY CISCOSAFEC_INCLUDE_DIR) +endif () diff --git a/internal/cmake/Modules/ImportInternal.cmake b/internal/cmake/Modules/ImportInternal.cmake new file mode 100644 index 000000000..73cdac1a7 --- /dev/null +++ b/internal/cmake/Modules/ImportInternal.cmake @@ -0,0 +1,23 @@ +# Copyright (c) 2017-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. + +macro(ImportInternal) + find_package(CiscoSafeC) + if (CiscoSafeC_FOUND) + list(APPEND COMPILER_DEFINITIONS + "-DENABLE_SAFEC" + ) + list(APPEND THIRD_PARTY_LIBRARIES ${CISCOSAFEC_LIBRARY}) + list(APPEND THIRD_PARTY_INCLUDE_DIRS ${CISCOSAFEC_INCLUDE_DIR}) + endif() +endmacro()
\ No newline at end of file diff --git a/internal/cmake/Modules/SetRelyGitRepo.cmake b/internal/cmake/Modules/SetRelyGitRepo.cmake new file mode 100644 index 000000000..facdc19b9 --- /dev/null +++ b/internal/cmake/Modules/SetRelyGitRepo.cmake @@ -0,0 +1,20 @@ +# Copyright (c) 2017-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. + +macro(SetRelyGitRepo) + if(DEFINED ENV{BITBUCKET_USERNAME} AND DEFINED ENV{BITBUCKET_PASSWORD}) + set(GIT_REPO https://$ENV{BITBUCKET_USERNAME}:$ENV{BITBUCKET_PASSWORD}@bitbucket-eng-gpk1.cisco.com/bitbucket/scm/icn/rely.git) + else() + set(GIT_REPO ssh://git@bitbucket-eng-gpk1.cisco.com:7999/icn/rely.git) + endif() +endmacro()
\ No newline at end of file |