diff options
| author |   Angelo Mantellini <manangel@cisco.com> | 2019-01-30 12:11:34 +0100 |
|---|---|---|
| committer | Angelo Mantellini <manangel@cisco.com> | 2019-01-30 15:23:44 +0100 |
| commit | e5145b878f9de35676085409878a66899d2ee4f2 (patch) | |
| tree | 177f77810901921ee03d1d3b850600c5f2cd1ef9 | |
| parent | 30061551cd39c9f30280bfa0cf3cc909f4fac015 (diff) | |
[HICN-18] first commit of libtransport for windows
Change-Id: I3a43b22194aa13ae5de1746e3d4bd9a275070261
Signed-off-by: Angelo Mantellini <manangel@cisco.com>
511 files changed, 310 insertions, 123 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 29fa1700b..29fa1700b 100755..100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt diff --git a/README.md b/README.md index c43dbb4ee..c43dbb4ee 100755..100644 --- a/README.md +++ b/README.md diff --git a/apps/README.md b/apps/README.md index 3d763f02b..3d763f02b 100755..100644 --- a/apps/README.md +++ b/apps/README.md diff --git a/cmake/Modules/BuildMacros.cmake b/cmake/Modules/BuildMacros.cmake index a1977f980..a1977f980 100755..100644 --- a/cmake/Modules/BuildMacros.cmake +++ b/cmake/Modules/BuildMacros.cmake diff --git a/cmake/Modules/FindAsio.cmake b/cmake/Modules/FindAsio.cmake index 73888e519..73888e519 100755..100644 --- a/cmake/Modules/FindAsio.cmake +++ b/cmake/Modules/FindAsio.cmake diff --git a/cmake/Modules/FindGFlags.cmake b/cmake/Modules/FindGFlags.cmake index 804bfebdc..804bfebdc 100755..100644 --- a/cmake/Modules/FindGFlags.cmake +++ b/cmake/Modules/FindGFlags.cmake diff --git a/cmake/Modules/FindGlog.cmake b/cmake/Modules/FindGlog.cmake index 10023a187..10023a187 100755..100644 --- a/cmake/Modules/FindGlog.cmake +++ b/cmake/Modules/FindGlog.cmake diff --git a/cmake/Modules/FindHicnBinaryApi.cmake b/cmake/Modules/FindHicnBinaryApi.cmake index 86a96ea19..86a96ea19 100755..100644 --- a/cmake/Modules/FindHicnBinaryApi.cmake +++ b/cmake/Modules/FindHicnBinaryApi.cmake diff --git a/cmake/Modules/FindLibEvent.cmake b/cmake/Modules/FindLibEvent.cmake index 5e4113716..5e4113716 100755..100644 --- a/cmake/Modules/FindLibEvent.cmake +++ b/cmake/Modules/FindLibEvent.cmake diff --git a/cmake/Modules/FindLibhicn.cmake b/cmake/Modules/FindLibhicn.cmake index 7cfaaa5e5..7cfaaa5e5 100755..100644 --- a/cmake/Modules/FindLibhicn.cmake +++ b/cmake/Modules/FindLibhicn.cmake diff --git a/cmake/Modules/FindLibmemif.cmake b/cmake/Modules/FindLibmemif.cmake index 48460eecd..48460eecd 100755..100644 --- a/cmake/Modules/FindLibmemif.cmake +++ b/cmake/Modules/FindLibmemif.cmake diff --git a/cmake/Modules/FindLibparc.cmake b/cmake/Modules/FindLibparc.cmake index c5c99af15..c5c99af15 100755..100644 --- a/cmake/Modules/FindLibparc.cmake +++ b/cmake/Modules/FindLibparc.cmake diff --git a/cmake/Modules/FindLibtransport.cmake b/cmake/Modules/FindLibtransport.cmake index 5910a64da..5910a64da 100755..100644 --- a/cmake/Modules/FindLibtransport.cmake +++ b/cmake/Modules/FindLibtransport.cmake diff --git a/cmake/Modules/FindLongBow.cmake b/cmake/Modules/FindLongBow.cmake index 4a05d7fdf..4a05d7fdf 100755..100644 --- a/cmake/Modules/FindLongBow.cmake +++ b/cmake/Modules/FindLongBow.cmake diff --git a/cmake/Modules/FindPThread.cmake b/cmake/Modules/FindPThread.cmake new file mode 100644 index 000000000..6f0eeb7c0 --- /dev/null +++ b/cmake/Modules/FindPThread.cmake @@ -0,0 +1,58 @@ +# Copyright (c) 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.
+
+########################################
+#
+# Find the PThread libraries and includes
+# This module sets:
+# PTHREAD_FOUND: True if pthread was found
+# PTHREADR_LIBRARY: The pthread library
+# PTHREAD_LIBRARIES: The pthread library and dependencies
+# PTHREAD_INCLUDE_DIR: The pthread include dir
+#
+
+
+set(PTHREAD_SEARCH_PATH_LIST
+ ${PTHREAD_HOME}
+ $ENV{PTHREAD_HOME}
+ /usr/local
+ /opt
+ /usr
+)
+
+find_path(PTHREAD_INCLUDE_DIR pthread.h
+ HINTS ${PTHREAD_SEARCH_PATH_LIST}
+ PATH_SUFFIXES include
+ DOC "Find the pthreadincludes"
+)
+
+if(CMAKE_SIZEOF_VOID_P EQUAL 8)
+ find_library(PTHREAD_LIBRARY NAMES pthreadVC2.lib
+ HINTS ${PTHREAD_SEARCH_PATH_LIST}
+ PATH_SUFFIXES lib/x64
+ DOC "Find the pthread libraries"
+ )
+elseif(CMAKE_SIZEOF_VOID_P EQUAL 4)
+ find_library(PTHREAD_LIBRARY NAMES pthreadVC2.lib
+ HINTS ${PTHREAD_SEARCH_PATH_LIST}
+ PATH_SUFFIXES lib/x32
+ DOC "Find the pthread libraries"
+ )
+endif()
+
+
+set(PTHREAD_LIBRARIES ${PTHREAD_LIBRARY})
+set(PTHREAD_INCLUDE_DIRS ${PTHREAD_INCLUDE_DIR})
+
+include(FindPackageHandleStandardArgs)
+find_package_handle_standard_args(Pthread DEFAULT_MSG PTHREAD_LIBRARIES PTHREAD_INCLUDE_DIRS)
\ No newline at end of file diff --git a/cmake/Modules/FindUncrustify.cmake b/cmake/Modules/FindUncrustify.cmake index f8f6b00b8..f8f6b00b8 100755..100644 --- a/cmake/Modules/FindUncrustify.cmake +++ b/cmake/Modules/FindUncrustify.cmake diff --git a/cmake/Modules/FindVpp.cmake b/cmake/Modules/FindVpp.cmake index ae11c8019..ae11c8019 100755..100644 --- a/cmake/Modules/FindVpp.cmake +++ b/cmake/Modules/FindVpp.cmake diff --git a/cmake/Modules/IosMacros.cmake b/cmake/Modules/IosMacros.cmake index b1e5cc438..b1e5cc438 100755..100644 --- a/cmake/Modules/IosMacros.cmake +++ b/cmake/Modules/IosMacros.cmake diff --git a/cmake/Modules/Packager.cmake b/cmake/Modules/Packager.cmake index c04e5c0b0..c04e5c0b0 100755..100644 --- a/cmake/Modules/Packager.cmake +++ b/cmake/Modules/Packager.cmake diff --git a/cmake/Modules/WindowsMacros.cmake b/cmake/Modules/WindowsMacros.cmake new file mode 100644 index 000000000..20f872759 --- /dev/null +++ b/cmake/Modules/WindowsMacros.cmake @@ -0,0 +1,33 @@ +# 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. + +if(WIN32) + find_package_wrapper(LibEvent REQUIRED) + find_package_wrapper(OpenSSL REQUIRED) + find_package_wrapper(PThread REQUIRED) + find_library(WSOCK32_LIBRARY wsock32 required) + find_library(WS2_32_LIBRARY ws2_32 required) + list(APPEND WINDOWS_LIBRARIES + ${LIBEVENT_LIBRARIES} + ${OPENSSL_LIBRARIES} + ${PTHREAD_LIBRARIES} + ${WSOCK32_LIBRARY} + ${WS2_32_LIBRARY} + ) + + list(APPEND WINDOWS_INCLUDE_DIRS + ${LIBEVENT_INCLUDE_DIRS} + ${OPENSSL_INCLUDE_DIR} + ${PTHREAD_INCLUDE_DIRS} + ) +endif()
\ No newline at end of file diff --git a/cmake/Modules/detectCacheSize.cmake b/cmake/Modules/detectCacheSize.cmake index a8209bb27..a8209bb27 100755..100644 --- a/cmake/Modules/detectCacheSize.cmake +++ b/cmake/Modules/detectCacheSize.cmake diff --git a/hicn-light/CMakeLists.txt b/hicn-light/CMakeLists.txt index 1a5a7f9e2..1a5a7f9e2 100755..100644 --- a/hicn-light/CMakeLists.txt +++ b/hicn-light/CMakeLists.txt diff --git a/hicn-light/README.md b/hicn-light/README.md index ba7ed77b3..ba7ed77b3 100755..100644 --- a/hicn-light/README.md +++ b/hicn-light/README.md diff --git a/hicn-light/config/hicn-light.service b/hicn-light/config/hicn-light.service index 0f976fc6c..0f976fc6c 100755..100644 --- a/hicn-light/config/hicn-light.service +++ b/hicn-light/config/hicn-light.service diff --git a/hicn-light/src/CMakeLists.txt b/hicn-light/src/CMakeLists.txt index 1951d00f7..1951d00f7 100755..100644 --- a/hicn-light/src/CMakeLists.txt +++ b/hicn-light/src/CMakeLists.txt diff --git a/hicn-light/src/command_line/CMakeLists.txt b/hicn-light/src/command_line/CMakeLists.txt index 16c23dc5c..16c23dc5c 100755..100644 --- a/hicn-light/src/command_line/CMakeLists.txt +++ b/hicn-light/src/command_line/CMakeLists.txt diff --git a/hicn-light/src/command_line/controller/CMakeLists.txt b/hicn-light/src/command_line/controller/CMakeLists.txt index b53e610a1..b53e610a1 100755..100644 --- a/hicn-light/src/command_line/controller/CMakeLists.txt +++ b/hicn-light/src/command_line/controller/CMakeLists.txt diff --git a/hicn-light/src/command_line/controller/hicnLightControl_main.c b/hicn-light/src/command_line/controller/hicnLightControl_main.c index 4641bddf5..4641bddf5 100755..100644 --- a/hicn-light/src/command_line/controller/hicnLightControl_main.c +++ b/hicn-light/src/command_line/controller/hicnLightControl_main.c diff --git a/hicn-light/src/command_line/daemon/CMakeLists.txt b/hicn-light/src/command_line/daemon/CMakeLists.txt index fd6cc9310..fd6cc9310 100755..100644 --- a/hicn-light/src/command_line/daemon/CMakeLists.txt +++ b/hicn-light/src/command_line/daemon/CMakeLists.txt diff --git a/hicn-light/src/command_line/daemon/hicnLightDaemon_main.c b/hicn-light/src/command_line/daemon/hicnLightDaemon_main.c index 415e98d65..415e98d65 100755..100644 --- a/hicn-light/src/command_line/daemon/hicnLightDaemon_main.c +++ b/hicn-light/src/command_line/daemon/hicnLightDaemon_main.c diff --git a/hicn-light/src/config.h.in b/hicn-light/src/config.h.in index 16ec1ab3a..16ec1ab3a 100755..100644 --- a/hicn-light/src/config.h.in +++ b/hicn-light/src/config.h.in diff --git a/hicn-light/src/config/CMakeLists.txt b/hicn-light/src/config/CMakeLists.txt index 5ce680bfc..5ce680bfc 100755..100644 --- a/hicn-light/src/config/CMakeLists.txt +++ b/hicn-light/src/config/CMakeLists.txt diff --git a/hicn-light/src/config/commandOps.c b/hicn-light/src/config/commandOps.c index 027c86e0a..027c86e0a 100755..100644 --- a/hicn-light/src/config/commandOps.c +++ b/hicn-light/src/config/commandOps.c diff --git a/hicn-light/src/config/commandOps.h b/hicn-light/src/config/commandOps.h index 6428a3ebf..6428a3ebf 100755..100644 --- a/hicn-light/src/config/commandOps.h +++ b/hicn-light/src/config/commandOps.h diff --git a/hicn-light/src/config/commandParser.c b/hicn-light/src/config/commandParser.c index 84d273c9d..84d273c9d 100755..100644 --- a/hicn-light/src/config/commandParser.c +++ b/hicn-light/src/config/commandParser.c diff --git a/hicn-light/src/config/commandParser.h b/hicn-light/src/config/commandParser.h index 78e19e6e3..78e19e6e3 100755..100644 --- a/hicn-light/src/config/commandParser.h +++ b/hicn-light/src/config/commandParser.h diff --git a/hicn-light/src/config/commandReturn.h b/hicn-light/src/config/commandReturn.h index 16ee93db1..16ee93db1 100755..100644 --- a/hicn-light/src/config/commandReturn.h +++ b/hicn-light/src/config/commandReturn.h diff --git a/hicn-light/src/config/configuration.c b/hicn-light/src/config/configuration.c index 737605932..737605932 100755..100644 --- a/hicn-light/src/config/configuration.c +++ b/hicn-light/src/config/configuration.c diff --git a/hicn-light/src/config/configuration.h b/hicn-light/src/config/configuration.h index 2bf66c0b1..2bf66c0b1 100755..100644 --- a/hicn-light/src/config/configuration.h +++ b/hicn-light/src/config/configuration.h diff --git a/hicn-light/src/config/configurationFile.c b/hicn-light/src/config/configurationFile.c index eab8f9362..eab8f9362 100755..100644 --- a/hicn-light/src/config/configurationFile.c +++ b/hicn-light/src/config/configurationFile.c diff --git a/hicn-light/src/config/configurationFile.h b/hicn-light/src/config/configurationFile.h index 54548191d..54548191d 100755..100644 --- a/hicn-light/src/config/configurationFile.h +++ b/hicn-light/src/config/configurationFile.h diff --git a/hicn-light/src/config/configurationListeners.c b/hicn-light/src/config/configurationListeners.c index 0982a2b13..0982a2b13 100755..100644 --- a/hicn-light/src/config/configurationListeners.c +++ b/hicn-light/src/config/configurationListeners.c diff --git a/hicn-light/src/config/configurationListeners.h b/hicn-light/src/config/configurationListeners.h index 7332b0c64..7332b0c64 100755..100644 --- a/hicn-light/src/config/configurationListeners.h +++ b/hicn-light/src/config/configurationListeners.h diff --git a/hicn-light/src/config/controlAdd.c b/hicn-light/src/config/controlAdd.c index 72f8e9759..72f8e9759 100755..100644 --- a/hicn-light/src/config/controlAdd.c +++ b/hicn-light/src/config/controlAdd.c diff --git a/hicn-light/src/config/controlAdd.h b/hicn-light/src/config/controlAdd.h index e1955f200..e1955f200 100755..100644 --- a/hicn-light/src/config/controlAdd.h +++ b/hicn-light/src/config/controlAdd.h diff --git a/hicn-light/src/config/controlAddConnection.c b/hicn-light/src/config/controlAddConnection.c index 0603e37a5..0603e37a5 100755..100644 --- a/hicn-light/src/config/controlAddConnection.c +++ b/hicn-light/src/config/controlAddConnection.c diff --git a/hicn-light/src/config/controlAddConnection.h b/hicn-light/src/config/controlAddConnection.h index 788306989..788306989 100755..100644 --- a/hicn-light/src/config/controlAddConnection.h +++ b/hicn-light/src/config/controlAddConnection.h diff --git a/hicn-light/src/config/controlAddListener.c b/hicn-light/src/config/controlAddListener.c index 8f687c3a6..8f687c3a6 100755..100644 --- a/hicn-light/src/config/controlAddListener.c +++ b/hicn-light/src/config/controlAddListener.c diff --git a/hicn-light/src/config/controlAddListener.h b/hicn-light/src/config/controlAddListener.h index d3fc55aaf..d3fc55aaf 100755..100644 --- a/hicn-light/src/config/controlAddListener.h +++ b/hicn-light/src/config/controlAddListener.h diff --git a/hicn-light/src/config/controlAddPunting.c b/hicn-light/src/config/controlAddPunting.c index bd87e517c..bd87e517c 100755..100644 --- a/hicn-light/src/config/controlAddPunting.c +++ b/hicn-light/src/config/controlAddPunting.c diff --git a/hicn-light/src/config/controlAddPunting.h b/hicn-light/src/config/controlAddPunting.h index e4d4aac7e..e4d4aac7e 100755..100644 --- a/hicn-light/src/config/controlAddPunting.h +++ b/hicn-light/src/config/controlAddPunting.h diff --git a/hicn-light/src/config/controlAddRoute.c b/hicn-light/src/config/controlAddRoute.c index c5ddab523..c5ddab523 100755..100644 --- a/hicn-light/src/config/controlAddRoute.c +++ b/hicn-light/src/config/controlAddRoute.c diff --git a/hicn-light/src/config/controlAddRoute.h b/hicn-light/src/config/controlAddRoute.h index be0ad1368..be0ad1368 100755..100644 --- a/hicn-light/src/config/controlAddRoute.h +++ b/hicn-light/src/config/controlAddRoute.h diff --git a/hicn-light/src/config/controlCache.c b/hicn-light/src/config/controlCache.c index d7afbfe7d..d7afbfe7d 100755..100644 --- a/hicn-light/src/config/controlCache.c +++ b/hicn-light/src/config/controlCache.c diff --git a/hicn-light/src/config/controlCache.h b/hicn-light/src/config/controlCache.h index a3614fce1..a3614fce1 100755..100644 --- a/hicn-light/src/config/controlCache.h +++ b/hicn-light/src/config/controlCache.h diff --git a/hicn-light/src/config/controlCacheClear.c b/hicn-light/src/config/controlCacheClear.c index c5a4e9fde..c5a4e9fde 100755..100644 --- a/hicn-light/src/config/controlCacheClear.c +++ b/hicn-light/src/config/controlCacheClear.c diff --git a/hicn-light/src/config/controlCacheClear.h b/hicn-light/src/config/controlCacheClear.h index 348ddba12..348ddba12 100755..100644 --- a/hicn-light/src/config/controlCacheClear.h +++ b/hicn-light/src/config/controlCacheClear.h diff --git a/hicn-light/src/config/controlCacheServe.c b/hicn-light/src/config/controlCacheServe.c index 85d598025..85d598025 100755..100644 --- a/hicn-light/src/config/controlCacheServe.c +++ b/hicn-light/src/config/controlCacheServe.c diff --git a/hicn-light/src/config/controlCacheServe.h b/hicn-light/src/config/controlCacheServe.h index 4bcec51f0..4bcec51f0 100755..100644 --- a/hicn-light/src/config/controlCacheServe.h +++ b/hicn-light/src/config/controlCacheServe.h diff --git a/hicn-light/src/config/controlCacheStore.c b/hicn-light/src/config/controlCacheStore.c index 3bbb34386..3bbb34386 100755..100644 --- a/hicn-light/src/config/controlCacheStore.c +++ b/hicn-light/src/config/controlCacheStore.c diff --git a/hicn-light/src/config/controlCacheStore.h b/hicn-light/src/config/controlCacheStore.h index ef5aca504..ef5aca504 100755..100644 --- a/hicn-light/src/config/controlCacheStore.h +++ b/hicn-light/src/config/controlCacheStore.h diff --git a/hicn-light/src/config/controlList.c b/hicn-light/src/config/controlList.c index 8afaa60dc..8afaa60dc 100755..100644 --- a/hicn-light/src/config/controlList.c +++ b/hicn-light/src/config/controlList.c diff --git a/hicn-light/src/config/controlList.h b/hicn-light/src/config/controlList.h index 53197331f..53197331f 100755..100644 --- a/hicn-light/src/config/controlList.h +++ b/hicn-light/src/config/controlList.h diff --git a/hicn-light/src/config/controlListConnections.c b/hicn-light/src/config/controlListConnections.c index 474ddc45f..474ddc45f 100755..100644 --- a/hicn-light/src/config/controlListConnections.c +++ b/hicn-light/src/config/controlListConnections.c diff --git a/hicn-light/src/config/controlListConnections.h b/hicn-light/src/config/controlListConnections.h index 17422c963..17422c963 100755..100644 --- a/hicn-light/src/config/controlListConnections.h +++ b/hicn-light/src/config/controlListConnections.h diff --git a/hicn-light/src/config/controlListInterfaces.c b/hicn-light/src/config/controlListInterfaces.c index 20338b553..20338b553 100755..100644 --- a/hicn-light/src/config/controlListInterfaces.c +++ b/hicn-light/src/config/controlListInterfaces.c diff --git a/hicn-light/src/config/controlListInterfaces.h b/hicn-light/src/config/controlListInterfaces.h index 0c0ca95cf..0c0ca95cf 100755..100644 --- a/hicn-light/src/config/controlListInterfaces.h +++ b/hicn-light/src/config/controlListInterfaces.h diff --git a/hicn-light/src/config/controlListListeners.c b/hicn-light/src/config/controlListListeners.c index a149051e2..a149051e2 100755..100644 --- a/hicn-light/src/config/controlListListeners.c +++ b/hicn-light/src/config/controlListListeners.c diff --git a/hicn-light/src/config/controlListListeners.h b/hicn-light/src/config/controlListListeners.h index 1f34eea56..1f34eea56 100755..100644 --- a/hicn-light/src/config/controlListListeners.h +++ b/hicn-light/src/config/controlListListeners.h diff --git a/hicn-light/src/config/controlListRoutes.c b/hicn-light/src/config/controlListRoutes.c index 4a21b5ef4..4a21b5ef4 100755..100644 --- a/hicn-light/src/config/controlListRoutes.c +++ b/hicn-light/src/config/controlListRoutes.c diff --git a/hicn-light/src/config/controlListRoutes.h b/hicn-light/src/config/controlListRoutes.h index 018c88ab0..018c88ab0 100755..100644 --- a/hicn-light/src/config/controlListRoutes.h +++ b/hicn-light/src/config/controlListRoutes.h diff --git a/hicn-light/src/config/controlMapMe.c b/hicn-light/src/config/controlMapMe.c index 2253f52b6..2253f52b6 100755..100644 --- a/hicn-light/src/config/controlMapMe.c +++ b/hicn-light/src/config/controlMapMe.c diff --git a/hicn-light/src/config/controlMapMe.h b/hicn-light/src/config/controlMapMe.h index d9cfdb82c..d9cfdb82c 100755..100644 --- a/hicn-light/src/config/controlMapMe.h +++ b/hicn-light/src/config/controlMapMe.h diff --git a/hicn-light/src/config/controlMapMeDiscovery.c b/hicn-light/src/config/controlMapMeDiscovery.c index f8f4bf082..f8f4bf082 100755..100644 --- a/hicn-light/src/config/controlMapMeDiscovery.c +++ b/hicn-light/src/config/controlMapMeDiscovery.c diff --git a/hicn-light/src/config/controlMapMeDiscovery.h b/hicn-light/src/config/controlMapMeDiscovery.h index c492fa0ab..c492fa0ab 100755..100644 --- a/hicn-light/src/config/controlMapMeDiscovery.h +++ b/hicn-light/src/config/controlMapMeDiscovery.h diff --git a/hicn-light/src/config/controlMapMeEnable.c b/hicn-light/src/config/controlMapMeEnable.c index db77450e5..db77450e5 100755..100644 --- a/hicn-light/src/config/controlMapMeEnable.c +++ b/hicn-light/src/config/controlMapMeEnable.c diff --git a/hicn-light/src/config/controlMapMeEnable.h b/hicn-light/src/config/controlMapMeEnable.h index f7ca6204d..f7ca6204d 100755..100644 --- a/hicn-light/src/config/controlMapMeEnable.h +++ b/hicn-light/src/config/controlMapMeEnable.h diff --git a/hicn-light/src/config/controlMapMeRetx.c b/hicn-light/src/config/controlMapMeRetx.c index bb16b8833..bb16b8833 100755..100644 --- a/hicn-light/src/config/controlMapMeRetx.c +++ b/hicn-light/src/config/controlMapMeRetx.c diff --git a/hicn-light/src/config/controlMapMeRetx.h b/hicn-light/src/config/controlMapMeRetx.h index 611bd3663..611bd3663 100755..100644 --- a/hicn-light/src/config/controlMapMeRetx.h +++ b/hicn-light/src/config/controlMapMeRetx.h diff --git a/hicn-light/src/config/controlMapMeTimescale.c b/hicn-light/src/config/controlMapMeTimescale.c index 9303b4b0f..9303b4b0f 100755..100644 --- a/hicn-light/src/config/controlMapMeTimescale.c +++ b/hicn-light/src/config/controlMapMeTimescale.c diff --git a/hicn-light/src/config/controlMapMeTimescale.h b/hicn-light/src/config/controlMapMeTimescale.h index d4b383696..d4b383696 100755..100644 --- a/hicn-light/src/config/controlMapMeTimescale.h +++ b/hicn-light/src/config/controlMapMeTimescale.h diff --git a/hicn-light/src/config/controlQuit.c b/hicn-light/src/config/controlQuit.c index 635fe278f..635fe278f 100755..100644 --- a/hicn-light/src/config/controlQuit.c +++ b/hicn-light/src/config/controlQuit.c diff --git a/hicn-light/src/config/controlQuit.h b/hicn-light/src/config/controlQuit.h index e2ba3540e..e2ba3540e 100755..100644 --- a/hicn-light/src/config/controlQuit.h +++ b/hicn-light/src/config/controlQuit.h diff --git a/hicn-light/src/config/controlRemove.c b/hicn-light/src/config/controlRemove.c index ede075a1b..ede075a1b 100755..100644 --- a/hicn-light/src/config/controlRemove.c +++ b/hicn-light/src/config/controlRemove.c diff --git a/hicn-light/src/config/controlRemove.h b/hicn-light/src/config/controlRemove.h index d75ecfe70..d75ecfe70 100755..100644 --- a/hicn-light/src/config/controlRemove.h +++ b/hicn-light/src/config/controlRemove.h diff --git a/hicn-light/src/config/controlRemoveConnection.c b/hicn-light/src/config/controlRemoveConnection.c index 93365ad17..93365ad17 100755..100644 --- a/hicn-light/src/config/controlRemoveConnection.c +++ b/hicn-light/src/config/controlRemoveConnection.c diff --git a/hicn-light/src/config/controlRemoveConnection.h b/hicn-light/src/config/controlRemoveConnection.h index 1dd1af23b..1dd1af23b 100755..100644 --- a/hicn-light/src/config/controlRemoveConnection.h +++ b/hicn-light/src/config/controlRemoveConnection.h diff --git a/hicn-light/src/config/controlRemovePunting.c b/hicn-light/src/config/controlRemovePunting.c index cf4c4fbd4..cf4c4fbd4 100755..100644 --- a/hicn-light/src/config/controlRemovePunting.c +++ b/hicn-light/src/config/controlRemovePunting.c diff --git a/hicn-light/src/config/controlRemovePunting.h b/hicn-light/src/config/controlRemovePunting.h index 89b1343e7..89b1343e7 100755..100644 --- a/hicn-light/src/config/controlRemovePunting.h +++ b/hicn-light/src/config/controlRemovePunting.h diff --git a/hicn-light/src/config/controlRemoveRoute.c b/hicn-light/src/config/controlRemoveRoute.c index b9b4ed1e4..b9b4ed1e4 100755..100644 --- a/hicn-light/src/config/controlRemoveRoute.c +++ b/hicn-light/src/config/controlRemoveRoute.c diff --git a/hicn-light/src/config/controlRemoveRoute.h b/hicn-light/src/config/controlRemoveRoute.h index a3c0ee46a..a3c0ee46a 100755..100644 --- a/hicn-light/src/config/controlRemoveRoute.h +++ b/hicn-light/src/config/controlRemoveRoute.h diff --git a/hicn-light/src/config/controlRoot.c b/hicn-light/src/config/controlRoot.c index 5d6c5f98e..5d6c5f98e 100755..100644 --- a/hicn-light/src/config/controlRoot.c +++ b/hicn-light/src/config/controlRoot.c diff --git a/hicn-light/src/config/controlRoot.h b/hicn-light/src/config/controlRoot.h index a62126eba..a62126eba 100755..100644 --- a/hicn-light/src/config/controlRoot.h +++ b/hicn-light/src/config/controlRoot.h diff --git a/hicn-light/src/config/controlSet.c b/hicn-light/src/config/controlSet.c index c6fd9aa3e..c6fd9aa3e 100755..100644 --- a/hicn-light/src/config/controlSet.c +++ b/hicn-light/src/config/controlSet.c diff --git a/hicn-light/src/config/controlSet.h b/hicn-light/src/config/controlSet.h index 4289aad8c..4289aad8c 100755..100644 --- a/hicn-light/src/config/controlSet.h +++ b/hicn-light/src/config/controlSet.h diff --git a/hicn-light/src/config/controlSetDebug.c b/hicn-light/src/config/controlSetDebug.c index ca432420e..ca432420e 100755..100644 --- a/hicn-light/src/config/controlSetDebug.c +++ b/hicn-light/src/config/controlSetDebug.c diff --git a/hicn-light/src/config/controlSetDebug.h b/hicn-light/src/config/controlSetDebug.h index 5335ebcab..5335ebcab 100755..100644 --- a/hicn-light/src/config/controlSetDebug.h +++ b/hicn-light/src/config/controlSetDebug.h diff --git a/hicn-light/src/config/controlSetStrategy.c b/hicn-light/src/config/controlSetStrategy.c index 7b7c11762..7b7c11762 100755..100644 --- a/hicn-light/src/config/controlSetStrategy.c +++ b/hicn-light/src/config/controlSetStrategy.c diff --git a/hicn-light/src/config/controlSetStrategy.h b/hicn-light/src/config/controlSetStrategy.h index 53ce8912c..53ce8912c 100755..100644 --- a/hicn-light/src/config/controlSetStrategy.h +++ b/hicn-light/src/config/controlSetStrategy.h diff --git a/hicn-light/src/config/controlSetWldr.c b/hicn-light/src/config/controlSetWldr.c index 9da404036..9da404036 100755..100644 --- a/hicn-light/src/config/controlSetWldr.c +++ b/hicn-light/src/config/controlSetWldr.c diff --git a/hicn-light/src/config/controlSetWldr.h b/hicn-light/src/config/controlSetWldr.h index 59c0b0fe6..59c0b0fe6 100755..100644 --- a/hicn-light/src/config/controlSetWldr.h +++ b/hicn-light/src/config/controlSetWldr.h diff --git a/hicn-light/src/config/controlState.c b/hicn-light/src/config/controlState.c index d8260e8e8..d8260e8e8 100755..100644 --- a/hicn-light/src/config/controlState.c +++ b/hicn-light/src/config/controlState.c diff --git a/hicn-light/src/config/controlState.h b/hicn-light/src/config/controlState.h index 905c56c30..905c56c30 100755..100644 --- a/hicn-light/src/config/controlState.h +++ b/hicn-light/src/config/controlState.h diff --git a/hicn-light/src/config/controlUnset.c b/hicn-light/src/config/controlUnset.c index 2da6a6518..2da6a6518 100755..100644 --- a/hicn-light/src/config/controlUnset.c +++ b/hicn-light/src/config/controlUnset.c diff --git a/hicn-light/src/config/controlUnset.h b/hicn-light/src/config/controlUnset.h index 6eeb983f7..6eeb983f7 100755..100644 --- a/hicn-light/src/config/controlUnset.h +++ b/hicn-light/src/config/controlUnset.h diff --git a/hicn-light/src/config/controlUnsetDebug.c b/hicn-light/src/config/controlUnsetDebug.c index 4892bd513..4892bd513 100755..100644 --- a/hicn-light/src/config/controlUnsetDebug.c +++ b/hicn-light/src/config/controlUnsetDebug.c diff --git a/hicn-light/src/config/controlUnsetDebug.h b/hicn-light/src/config/controlUnsetDebug.h index e34f8aa5f..e34f8aa5f 100755..100644 --- a/hicn-light/src/config/controlUnsetDebug.h +++ b/hicn-light/src/config/controlUnsetDebug.h diff --git a/hicn-light/src/config/symbolicNameTable.c b/hicn-light/src/config/symbolicNameTable.c index ccf416d67..ccf416d67 100755..100644 --- a/hicn-light/src/config/symbolicNameTable.c +++ b/hicn-light/src/config/symbolicNameTable.c diff --git a/hicn-light/src/config/symbolicNameTable.h b/hicn-light/src/config/symbolicNameTable.h index 69919cf00..69919cf00 100755..100644 --- a/hicn-light/src/config/symbolicNameTable.h +++ b/hicn-light/src/config/symbolicNameTable.h diff --git a/hicn-light/src/content_store/CMakeLists.txt b/hicn-light/src/content_store/CMakeLists.txt index 85643cf5e..85643cf5e 100755..100644 --- a/hicn-light/src/content_store/CMakeLists.txt +++ b/hicn-light/src/content_store/CMakeLists.txt diff --git a/hicn-light/src/content_store/contentStoreEntry.c b/hicn-light/src/content_store/contentStoreEntry.c index d36ed61a0..d36ed61a0 100755..100644 --- a/hicn-light/src/content_store/contentStoreEntry.c +++ b/hicn-light/src/content_store/contentStoreEntry.c diff --git a/hicn-light/src/content_store/contentStoreEntry.h b/hicn-light/src/content_store/contentStoreEntry.h index 766cc15e4..766cc15e4 100755..100644 --- a/hicn-light/src/content_store/contentStoreEntry.h +++ b/hicn-light/src/content_store/contentStoreEntry.h diff --git a/hicn-light/src/content_store/contentStoreInterface.c b/hicn-light/src/content_store/contentStoreInterface.c index a42041670..a42041670 100755..100644 --- a/hicn-light/src/content_store/contentStoreInterface.c +++ b/hicn-light/src/content_store/contentStoreInterface.c diff --git a/hicn-light/src/content_store/contentStoreInterface.h b/hicn-light/src/content_store/contentStoreInterface.h index d73c63019..d73c63019 100755..100644 --- a/hicn-light/src/content_store/contentStoreInterface.h +++ b/hicn-light/src/content_store/contentStoreInterface.h diff --git a/hicn-light/src/content_store/contentStoreLRU.c b/hicn-light/src/content_store/contentStoreLRU.c index 9b69d51c0..9b69d51c0 100755..100644 --- a/hicn-light/src/content_store/contentStoreLRU.c +++ b/hicn-light/src/content_store/contentStoreLRU.c diff --git a/hicn-light/src/content_store/contentStoreLRU.h b/hicn-light/src/content_store/contentStoreLRU.h index 3c0815ebd..3c0815ebd 100755..100644 --- a/hicn-light/src/content_store/contentStoreLRU.h +++ b/hicn-light/src/content_store/contentStoreLRU.h diff --git a/hicn-light/src/content_store/listLRU.c b/hicn-light/src/content_store/listLRU.c index 42b491d7c..42b491d7c 100755..100644 --- a/hicn-light/src/content_store/listLRU.c +++ b/hicn-light/src/content_store/listLRU.c diff --git a/hicn-light/src/content_store/listLRU.h b/hicn-light/src/content_store/listLRU.h index 75f698b61..75f698b61 100755..100644 --- a/hicn-light/src/content_store/listLRU.h +++ b/hicn-light/src/content_store/listLRU.h diff --git a/hicn-light/src/content_store/listTimeOrdered.c b/hicn-light/src/content_store/listTimeOrdered.c index 44697d202..44697d202 100755..100644 --- a/hicn-light/src/content_store/listTimeOrdered.c +++ b/hicn-light/src/content_store/listTimeOrdered.c diff --git a/hicn-light/src/content_store/listTimeOrdered.h b/hicn-light/src/content_store/listTimeOrdered.h index b18bd16f7..b18bd16f7 100755..100644 --- a/hicn-light/src/content_store/listTimeOrdered.h +++ b/hicn-light/src/content_store/listTimeOrdered.h diff --git a/hicn-light/src/core/CMakeLists.txt b/hicn-light/src/core/CMakeLists.txt index 1d7dc03e9..1d7dc03e9 100755..100644 --- a/hicn-light/src/core/CMakeLists.txt +++ b/hicn-light/src/core/CMakeLists.txt diff --git a/hicn-light/src/core/connection.c b/hicn-light/src/core/connection.c index 073b7260f..073b7260f 100755..100644 --- a/hicn-light/src/core/connection.c +++ b/hicn-light/src/core/connection.c diff --git a/hicn-light/src/core/connection.h b/hicn-light/src/core/connection.h index b5c703527..b5c703527 100755..100644 --- a/hicn-light/src/core/connection.h +++ b/hicn-light/src/core/connection.h diff --git a/hicn-light/src/core/connectionList.c b/hicn-light/src/core/connectionList.c index b2913fa05..b2913fa05 100755..100644 --- a/hicn-light/src/core/connectionList.c +++ b/hicn-light/src/core/connectionList.c diff --git a/hicn-light/src/core/connectionList.h b/hicn-light/src/core/connectionList.h index cdca12993..cdca12993 100755..100644 --- a/hicn-light/src/core/connectionList.h +++ b/hicn-light/src/core/connectionList.h diff --git a/hicn-light/src/core/connectionManager.c b/hicn-light/src/core/connectionManager.c index 2089e1495..2089e1495 100755..100644 --- a/hicn-light/src/core/connectionManager.c +++ b/hicn-light/src/core/connectionManager.c diff --git a/hicn-light/src/core/connectionManager.h b/hicn-light/src/core/connectionManager.h index b77553e0d..b77553e0d 100755..100644 --- a/hicn-light/src/core/connectionManager.h +++ b/hicn-light/src/core/connectionManager.h diff --git a/hicn-light/src/core/connectionTable.c b/hicn-light/src/core/connectionTable.c index ba0942ddb..ba0942ddb 100755..100644 --- a/hicn-light/src/core/connectionTable.c +++ b/hicn-light/src/core/connectionTable.c diff --git a/hicn-light/src/core/connectionTable.h b/hicn-light/src/core/connectionTable.h index 30517ae1d..30517ae1d 100755..100644 --- a/hicn-light/src/core/connectionTable.h +++ b/hicn-light/src/core/connectionTable.h diff --git a/hicn-light/src/core/dispatcher.c b/hicn-light/src/core/dispatcher.c index 078087c59..078087c59 100755..100644 --- a/hicn-light/src/core/dispatcher.c +++ b/hicn-light/src/core/dispatcher.c diff --git a/hicn-light/src/core/dispatcher.h b/hicn-light/src/core/dispatcher.h index 35d804a00..35d804a00 100755..100644 --- a/hicn-light/src/core/dispatcher.h +++ b/hicn-light/src/core/dispatcher.h diff --git a/hicn-light/src/core/forwarder.c b/hicn-light/src/core/forwarder.c index e84351365..e84351365 100755..100644 --- a/hicn-light/src/core/forwarder.c +++ b/hicn-light/src/core/forwarder.c diff --git a/hicn-light/src/core/forwarder.h b/hicn-light/src/core/forwarder.h index e044add3b..e044add3b 100755..100644 --- a/hicn-light/src/core/forwarder.h +++ b/hicn-light/src/core/forwarder.h diff --git a/hicn-light/src/core/logger.c b/hicn-light/src/core/logger.c index cac3000e2..cac3000e2 100755..100644 --- a/hicn-light/src/core/logger.c +++ b/hicn-light/src/core/logger.c diff --git a/hicn-light/src/core/logger.h b/hicn-light/src/core/logger.h index e2ab7e147..e2ab7e147 100755..100644 --- a/hicn-light/src/core/logger.h +++ b/hicn-light/src/core/logger.h diff --git a/hicn-light/src/core/mapMe.c b/hicn-light/src/core/mapMe.c index 4444bcf15..4444bcf15 100755..100644 --- a/hicn-light/src/core/mapMe.c +++ b/hicn-light/src/core/mapMe.c diff --git a/hicn-light/src/core/mapMe.h b/hicn-light/src/core/mapMe.h index 39edd0bd7..39edd0bd7 100755..100644 --- a/hicn-light/src/core/mapMe.h +++ b/hicn-light/src/core/mapMe.h diff --git a/hicn-light/src/core/message.c b/hicn-light/src/core/message.c index 6c0e916d2..6c0e916d2 100755..100644 --- a/hicn-light/src/core/message.c +++ b/hicn-light/src/core/message.c diff --git a/hicn-light/src/core/message.h b/hicn-light/src/core/message.h index 88aa32480..88aa32480 100755..100644 --- a/hicn-light/src/core/message.h +++ b/hicn-light/src/core/message.h diff --git a/hicn-light/src/core/messageHandler.h b/hicn-light/src/core/messageHandler.h index cf8ab3672..cf8ab3672 100755..100644 --- a/hicn-light/src/core/messageHandler.h +++ b/hicn-light/src/core/messageHandler.h diff --git a/hicn-light/src/core/messagePacketType.h b/hicn-light/src/core/messagePacketType.h index dfbb12342..dfbb12342 100755..100644 --- a/hicn-light/src/core/messagePacketType.h +++ b/hicn-light/src/core/messagePacketType.h diff --git a/hicn-light/src/core/name.c b/hicn-light/src/core/name.c index f6a452d27..f6a452d27 100755..100644 --- a/hicn-light/src/core/name.c +++ b/hicn-light/src/core/name.c diff --git a/hicn-light/src/core/name.h b/hicn-light/src/core/name.h index fb4ad7a56..fb4ad7a56 100755..100644 --- a/hicn-light/src/core/name.h +++ b/hicn-light/src/core/name.h diff --git a/hicn-light/src/core/nameBitvector.c b/hicn-light/src/core/nameBitvector.c index 66f3eae20..66f3eae20 100755..100644 --- a/hicn-light/src/core/nameBitvector.c +++ b/hicn-light/src/core/nameBitvector.c diff --git a/hicn-light/src/core/nameBitvector.h b/hicn-light/src/core/nameBitvector.h index 28a31dc26..28a31dc26 100755..100644 --- a/hicn-light/src/core/nameBitvector.h +++ b/hicn-light/src/core/nameBitvector.h diff --git a/hicn-light/src/core/numberSet.c b/hicn-light/src/core/numberSet.c index 75fec1524..75fec1524 100755..100644 --- a/hicn-light/src/core/numberSet.c +++ b/hicn-light/src/core/numberSet.c diff --git a/hicn-light/src/core/numberSet.h b/hicn-light/src/core/numberSet.h index 91a965d7b..91a965d7b 100755..100644 --- a/hicn-light/src/core/numberSet.h +++ b/hicn-light/src/core/numberSet.h diff --git a/hicn-light/src/core/streamBuffer.c b/hicn-light/src/core/streamBuffer.c index 7aebb5edb..7aebb5edb 100755..100644 --- a/hicn-light/src/core/streamBuffer.c +++ b/hicn-light/src/core/streamBuffer.c diff --git a/hicn-light/src/core/streamBuffer.h b/hicn-light/src/core/streamBuffer.h index 27e793176..27e793176 100755..100644 --- a/hicn-light/src/core/streamBuffer.h +++ b/hicn-light/src/core/streamBuffer.h diff --git a/hicn-light/src/core/system.h b/hicn-light/src/core/system.h index 3c5c8cba2..3c5c8cba2 100755..100644 --- a/hicn-light/src/core/system.h +++ b/hicn-light/src/core/system.h diff --git a/hicn-light/src/core/ticks.h b/hicn-light/src/core/ticks.h index 8750abde5..8750abde5 100755..100644 --- a/hicn-light/src/core/ticks.h +++ b/hicn-light/src/core/ticks.h diff --git a/hicn-light/src/core/wldr.c b/hicn-light/src/core/wldr.c index b94ae76e5..b94ae76e5 100755..100644 --- a/hicn-light/src/core/wldr.c +++ b/hicn-light/src/core/wldr.c diff --git a/hicn-light/src/core/wldr.h b/hicn-light/src/core/wldr.h index 1666b4d3f..1666b4d3f 100755..100644 --- a/hicn-light/src/core/wldr.h +++ b/hicn-light/src/core/wldr.h diff --git a/hicn-light/src/io/CMakeLists.txt b/hicn-light/src/io/CMakeLists.txt index f65f0b580..f65f0b580 100755..100644 --- a/hicn-light/src/io/CMakeLists.txt +++ b/hicn-light/src/io/CMakeLists.txt diff --git a/hicn-light/src/io/addressPair.c b/hicn-light/src/io/addressPair.c index 5d2017a3d..5d2017a3d 100755..100644 --- a/hicn-light/src/io/addressPair.c +++ b/hicn-light/src/io/addressPair.c diff --git a/hicn-light/src/io/addressPair.h b/hicn-light/src/io/addressPair.h index 5152267b6..5152267b6 100755..100644 --- a/hicn-light/src/io/addressPair.h +++ b/hicn-light/src/io/addressPair.h diff --git a/hicn-light/src/io/hicnConnection.c b/hicn-light/src/io/hicnConnection.c index 6def8ed43..6def8ed43 100755..100644 --- a/hicn-light/src/io/hicnConnection.c +++ b/hicn-light/src/io/hicnConnection.c diff --git a/hicn-light/src/io/hicnConnection.h b/hicn-light/src/io/hicnConnection.h index 930e2d470..930e2d470 100755..100644 --- a/hicn-light/src/io/hicnConnection.h +++ b/hicn-light/src/io/hicnConnection.h diff --git a/hicn-light/src/io/hicnListener.c b/hicn-light/src/io/hicnListener.c index 789face90..789face90 100755..100644 --- a/hicn-light/src/io/hicnListener.c +++ b/hicn-light/src/io/hicnListener.c diff --git a/hicn-light/src/io/hicnListener.h b/hicn-light/src/io/hicnListener.h index 5897d33ad..5897d33ad 100755..100644 --- a/hicn-light/src/io/hicnListener.h +++ b/hicn-light/src/io/hicnListener.h diff --git a/hicn-light/src/io/hicnTunnel.c b/hicn-light/src/io/hicnTunnel.c index e55393137..e55393137 100755..100644 --- a/hicn-light/src/io/hicnTunnel.c +++ b/hicn-light/src/io/hicnTunnel.c diff --git a/hicn-light/src/io/hicnTunnel.h b/hicn-light/src/io/hicnTunnel.h index 70295797c..70295797c 100755..100644 --- a/hicn-light/src/io/hicnTunnel.h +++ b/hicn-light/src/io/hicnTunnel.h diff --git a/hicn-light/src/io/ioOperations.c b/hicn-light/src/io/ioOperations.c index bbc8cec91..bbc8cec91 100755..100644 --- a/hicn-light/src/io/ioOperations.c +++ b/hicn-light/src/io/ioOperations.c diff --git a/hicn-light/src/io/ioOperations.h b/hicn-light/src/io/ioOperations.h index dee66030d..dee66030d 100755..100644 --- a/hicn-light/src/io/ioOperations.h +++ b/hicn-light/src/io/ioOperations.h diff --git a/hicn-light/src/io/listener.h b/hicn-light/src/io/listener.h index ffbb513fa..ffbb513fa 100755..100644 --- a/hicn-light/src/io/listener.h +++ b/hicn-light/src/io/listener.h diff --git a/hicn-light/src/io/listenerSet.c b/hicn-light/src/io/listenerSet.c index a890cd5b8..a890cd5b8 100755..100644 --- a/hicn-light/src/io/listenerSet.c +++ b/hicn-light/src/io/listenerSet.c diff --git a/hicn-light/src/io/listenerSet.h b/hicn-light/src/io/listenerSet.h index 671e68479..671e68479 100755..100644 --- a/hicn-light/src/io/listenerSet.h +++ b/hicn-light/src/io/listenerSet.h diff --git a/hicn-light/src/io/streamConnection.c b/hicn-light/src/io/streamConnection.c index 948b6c01b..948b6c01b 100755..100644 --- a/hicn-light/src/io/streamConnection.c +++ b/hicn-light/src/io/streamConnection.c diff --git a/hicn-light/src/io/streamConnection.h b/hicn-light/src/io/streamConnection.h index 8eb63a094..8eb63a094 100755..100644 --- a/hicn-light/src/io/streamConnection.h +++ b/hicn-light/src/io/streamConnection.h diff --git a/hicn-light/src/io/tcpListener.c b/hicn-light/src/io/tcpListener.c index 6f0477f5b..6f0477f5b 100755..100644 --- a/hicn-light/src/io/tcpListener.c +++ b/hicn-light/src/io/tcpListener.c diff --git a/hicn-light/src/io/tcpListener.h b/hicn-light/src/io/tcpListener.h index c5d1e33af..c5d1e33af 100755..100644 --- a/hicn-light/src/io/tcpListener.h +++ b/hicn-light/src/io/tcpListener.h diff --git a/hicn-light/src/io/tcpTunnel.c b/hicn-light/src/io/tcpTunnel.c index a2bf2bd30..a2bf2bd30 100755..100644 --- a/hicn-light/src/io/tcpTunnel.c +++ b/hicn-light/src/io/tcpTunnel.c diff --git a/hicn-light/src/io/tcpTunnel.h b/hicn-light/src/io/tcpTunnel.h index 4daa7d032..4daa7d032 100755..100644 --- a/hicn-light/src/io/tcpTunnel.h +++ b/hicn-light/src/io/tcpTunnel.h diff --git a/hicn-light/src/io/udpConnection.c b/hicn-light/src/io/udpConnection.c index 2aa6edc51..2aa6edc51 100755..100644 --- a/hicn-light/src/io/udpConnection.c +++ b/hicn-light/src/io/udpConnection.c diff --git a/hicn-light/src/io/udpConnection.h b/hicn-light/src/io/udpConnection.h index 122f332d5..122f332d5 100755..100644 --- a/hicn-light/src/io/udpConnection.h +++ b/hicn-light/src/io/udpConnection.h diff --git a/hicn-light/src/io/udpListener.c b/hicn-light/src/io/udpListener.c index 31c0e673b..31c0e673b 100755..100644 --- a/hicn-light/src/io/udpListener.c +++ b/hicn-light/src/io/udpListener.c diff --git a/hicn-light/src/io/udpListener.h b/hicn-light/src/io/udpListener.h index 1cf3bd887..1cf3bd887 100755..100644 --- a/hicn-light/src/io/udpListener.h +++ b/hicn-light/src/io/udpListener.h diff --git a/hicn-light/src/io/udpTunnel.c b/hicn-light/src/io/udpTunnel.c index d06a35ce6..d06a35ce6 100755..100644 --- a/hicn-light/src/io/udpTunnel.c +++ b/hicn-light/src/io/udpTunnel.c diff --git a/hicn-light/src/io/udpTunnel.h b/hicn-light/src/io/udpTunnel.h index a79ca4a4e..a79ca4a4e 100755..100644 --- a/hicn-light/src/io/udpTunnel.h +++ b/hicn-light/src/io/udpTunnel.h diff --git a/hicn-light/src/messenger/CMakeLists.txt b/hicn-light/src/messenger/CMakeLists.txt index 92bc13b5b..92bc13b5b 100755..100644 --- a/hicn-light/src/messenger/CMakeLists.txt +++ b/hicn-light/src/messenger/CMakeLists.txt diff --git a/hicn-light/src/messenger/messenger.c b/hicn-light/src/messenger/messenger.c index 26c7a85e2..26c7a85e2 100755..100644 --- a/hicn-light/src/messenger/messenger.c +++ b/hicn-light/src/messenger/messenger.c diff --git a/hicn-light/src/messenger/messenger.h b/hicn-light/src/messenger/messenger.h index f945e7e72..f945e7e72 100755..100644 --- a/hicn-light/src/messenger/messenger.h +++ b/hicn-light/src/messenger/messenger.h diff --git a/hicn-light/src/messenger/messengerRecipient.c b/hicn-light/src/messenger/messengerRecipient.c index 14251f8eb..14251f8eb 100755..100644 --- a/hicn-light/src/messenger/messengerRecipient.c +++ b/hicn-light/src/messenger/messengerRecipient.c diff --git a/hicn-light/src/messenger/messengerRecipient.h b/hicn-light/src/messenger/messengerRecipient.h index 66d8f40f5..66d8f40f5 100755..100644 --- a/hicn-light/src/messenger/messengerRecipient.h +++ b/hicn-light/src/messenger/messengerRecipient.h diff --git a/hicn-light/src/messenger/missive.c b/hicn-light/src/messenger/missive.c index a8bcb0282..a8bcb0282 100755..100644 --- a/hicn-light/src/messenger/missive.c +++ b/hicn-light/src/messenger/missive.c diff --git a/hicn-light/src/messenger/missive.h b/hicn-light/src/messenger/missive.h index 33f3ef8b8..33f3ef8b8 100755..100644 --- a/hicn-light/src/messenger/missive.h +++ b/hicn-light/src/messenger/missive.h diff --git a/hicn-light/src/messenger/missiveDeque.c b/hicn-light/src/messenger/missiveDeque.c index 418027d7a..418027d7a 100755..100644 --- a/hicn-light/src/messenger/missiveDeque.c +++ b/hicn-light/src/messenger/missiveDeque.c diff --git a/hicn-light/src/messenger/missiveDeque.h b/hicn-light/src/messenger/missiveDeque.h index c6f955ce0..c6f955ce0 100755..100644 --- a/hicn-light/src/messenger/missiveDeque.h +++ b/hicn-light/src/messenger/missiveDeque.h diff --git a/hicn-light/src/messenger/missiveType.h b/hicn-light/src/messenger/missiveType.h index b0d9c7704..b0d9c7704 100755..100644 --- a/hicn-light/src/messenger/missiveType.h +++ b/hicn-light/src/messenger/missiveType.h diff --git a/hicn-light/src/platforms/CMakeLists.txt b/hicn-light/src/platforms/CMakeLists.txt index fcb4282ba..fcb4282ba 100755..100644 --- a/hicn-light/src/platforms/CMakeLists.txt +++ b/hicn-light/src/platforms/CMakeLists.txt diff --git a/hicn-light/src/platforms/README.txt b/hicn-light/src/platforms/README.txt index a1293944c..a1293944c 100755..100644 --- a/hicn-light/src/platforms/README.txt +++ b/hicn-light/src/platforms/README.txt diff --git a/hicn-light/src/platforms/android/system.c b/hicn-light/src/platforms/android/system.c index 68f99424b..68f99424b 100755..100644 --- a/hicn-light/src/platforms/android/system.c +++ b/hicn-light/src/platforms/android/system.c diff --git a/hicn-light/src/platforms/darwin/system.c b/hicn-light/src/platforms/darwin/system.c index b8ef80c63..b8ef80c63 100755..100644 --- a/hicn-light/src/platforms/darwin/system.c +++ b/hicn-light/src/platforms/darwin/system.c diff --git a/hicn-light/src/platforms/linux/system.c b/hicn-light/src/platforms/linux/system.c index fcf13becc..fcf13becc 100755..100644 --- a/hicn-light/src/platforms/linux/system.c +++ b/hicn-light/src/platforms/linux/system.c diff --git a/hicn-light/src/processor/CMakeLists.txt b/hicn-light/src/processor/CMakeLists.txt index b7eeabe3b..b7eeabe3b 100755..100644 --- a/hicn-light/src/processor/CMakeLists.txt +++ b/hicn-light/src/processor/CMakeLists.txt diff --git a/hicn-light/src/processor/fib.c b/hicn-light/src/processor/fib.c index 33d31fd8a..33d31fd8a 100755..100644 --- a/hicn-light/src/processor/fib.c +++ b/hicn-light/src/processor/fib.c diff --git a/hicn-light/src/processor/fib.h b/hicn-light/src/processor/fib.h index 4409419db..4409419db 100755..100644 --- a/hicn-light/src/processor/fib.h +++ b/hicn-light/src/processor/fib.h diff --git a/hicn-light/src/processor/fibEntry.c b/hicn-light/src/processor/fibEntry.c index bb877030f..bb877030f 100755..100644 --- a/hicn-light/src/processor/fibEntry.c +++ b/hicn-light/src/processor/fibEntry.c diff --git a/hicn-light/src/processor/fibEntry.h b/hicn-light/src/processor/fibEntry.h index 3bcac3884..3bcac3884 100755..100644 --- a/hicn-light/src/processor/fibEntry.h +++ b/hicn-light/src/processor/fibEntry.h diff --git a/hicn-light/src/processor/fibEntryList.c b/hicn-light/src/processor/fibEntryList.c index 2221fa614..2221fa614 100755..100644 --- a/hicn-light/src/processor/fibEntryList.c +++ b/hicn-light/src/processor/fibEntryList.c diff --git a/hicn-light/src/processor/fibEntryList.h b/hicn-light/src/processor/fibEntryList.h index 0f6066435..0f6066435 100755..100644 --- a/hicn-light/src/processor/fibEntryList.h +++ b/hicn-light/src/processor/fibEntryList.h diff --git a/hicn-light/src/processor/hashTableFunction.c b/hicn-light/src/processor/hashTableFunction.c index 6e70ef91a..6e70ef91a 100755..100644 --- a/hicn-light/src/processor/hashTableFunction.c +++ b/hicn-light/src/processor/hashTableFunction.c diff --git a/hicn-light/src/processor/hashTableFunction.h b/hicn-light/src/processor/hashTableFunction.h index eb9989086..eb9989086 100755..100644 --- a/hicn-light/src/processor/hashTableFunction.h +++ b/hicn-light/src/processor/hashTableFunction.h diff --git a/hicn-light/src/processor/matchingRulesTable.c b/hicn-light/src/processor/matchingRulesTable.c index 56e59c29e..56e59c29e 100755..100644 --- a/hicn-light/src/processor/matchingRulesTable.c +++ b/hicn-light/src/processor/matchingRulesTable.c diff --git a/hicn-light/src/processor/matchingRulesTable.h b/hicn-light/src/processor/matchingRulesTable.h index 96d099430..96d099430 100755..100644 --- a/hicn-light/src/processor/matchingRulesTable.h +++ b/hicn-light/src/processor/matchingRulesTable.h diff --git a/hicn-light/src/processor/messageProcessor.c b/hicn-light/src/processor/messageProcessor.c index 8c03ee739..8c03ee739 100755..100644 --- a/hicn-light/src/processor/messageProcessor.c +++ b/hicn-light/src/processor/messageProcessor.c diff --git a/hicn-light/src/processor/messageProcessor.h b/hicn-light/src/processor/messageProcessor.h index ce3049938..ce3049938 100755..100644 --- a/hicn-light/src/processor/messageProcessor.h +++ b/hicn-light/src/processor/messageProcessor.h diff --git a/hicn-light/src/processor/pit.c b/hicn-light/src/processor/pit.c index 9cae4062e..9cae4062e 100755..100644 --- a/hicn-light/src/processor/pit.c +++ b/hicn-light/src/processor/pit.c diff --git a/hicn-light/src/processor/pit.h b/hicn-light/src/processor/pit.h index 1f909be3e..1f909be3e 100755..100644 --- a/hicn-light/src/processor/pit.h +++ b/hicn-light/src/processor/pit.h diff --git a/hicn-light/src/processor/pitEntry.c b/hicn-light/src/processor/pitEntry.c index 38103cb8e..38103cb8e 100755..100644 --- a/hicn-light/src/processor/pitEntry.c +++ b/hicn-light/src/processor/pitEntry.c diff --git a/hicn-light/src/processor/pitEntry.h b/hicn-light/src/processor/pitEntry.h index b7d45e6a4..b7d45e6a4 100755..100644 --- a/hicn-light/src/processor/pitEntry.h +++ b/hicn-light/src/processor/pitEntry.h diff --git a/hicn-light/src/processor/pitStandard.c b/hicn-light/src/processor/pitStandard.c index 8d507626a..8d507626a 100755..100644 --- a/hicn-light/src/processor/pitStandard.c +++ b/hicn-light/src/processor/pitStandard.c diff --git a/hicn-light/src/processor/pitStandard.h b/hicn-light/src/processor/pitStandard.h index b9ba026c8..b9ba026c8 100755..100644 --- a/hicn-light/src/processor/pitStandard.h +++ b/hicn-light/src/processor/pitStandard.h diff --git a/hicn-light/src/processor/pitVerdict.h b/hicn-light/src/processor/pitVerdict.h index 16631fa51..16631fa51 100755..100644 --- a/hicn-light/src/processor/pitVerdict.h +++ b/hicn-light/src/processor/pitVerdict.h diff --git a/hicn-light/src/socket/CMakeLists.txt b/hicn-light/src/socket/CMakeLists.txt index 6ea94dcfa..6ea94dcfa 100755..100644 --- a/hicn-light/src/socket/CMakeLists.txt +++ b/hicn-light/src/socket/CMakeLists.txt diff --git a/hicn-light/src/socket/api.c b/hicn-light/src/socket/api.c index aede01efe..aede01efe 100755..100644 --- a/hicn-light/src/socket/api.c +++ b/hicn-light/src/socket/api.c diff --git a/hicn-light/src/socket/api.h b/hicn-light/src/socket/api.h index e1516ebe1..e1516ebe1 100755..100644 --- a/hicn-light/src/socket/api.h +++ b/hicn-light/src/socket/api.h diff --git a/hicn-light/src/socket/error.c b/hicn-light/src/socket/error.c index 3dafec8cf..3dafec8cf 100755..100644 --- a/hicn-light/src/socket/error.c +++ b/hicn-light/src/socket/error.c diff --git a/hicn-light/src/socket/error.h b/hicn-light/src/socket/error.h index 8195efd84..8195efd84 100755..100644 --- a/hicn-light/src/socket/error.h +++ b/hicn-light/src/socket/error.h diff --git a/hicn-light/src/socket/ops.h b/hicn-light/src/socket/ops.h index 249caf87a..249caf87a 100755..100644 --- a/hicn-light/src/socket/ops.h +++ b/hicn-light/src/socket/ops.h diff --git a/hicn-light/src/socket/ops_linux.c b/hicn-light/src/socket/ops_linux.c index d085f0d3d..d085f0d3d 100755..100644 --- a/hicn-light/src/socket/ops_linux.c +++ b/hicn-light/src/socket/ops_linux.c diff --git a/hicn-light/src/strategies/CMakeLists.txt b/hicn-light/src/strategies/CMakeLists.txt index 7f0730b2f..7f0730b2f 100755..100644 --- a/hicn-light/src/strategies/CMakeLists.txt +++ b/hicn-light/src/strategies/CMakeLists.txt diff --git a/hicn-light/src/strategies/loadBalancer.c b/hicn-light/src/strategies/loadBalancer.c index 14e907770..14e907770 100755..100644 --- a/hicn-light/src/strategies/loadBalancer.c +++ b/hicn-light/src/strategies/loadBalancer.c diff --git a/hicn-light/src/strategies/loadBalancer.h b/hicn-light/src/strategies/loadBalancer.h index 1178c30fe..1178c30fe 100755..100644 --- a/hicn-light/src/strategies/loadBalancer.h +++ b/hicn-light/src/strategies/loadBalancer.h diff --git a/hicn-light/src/strategies/loadBalancerWithPD.c b/hicn-light/src/strategies/loadBalancerWithPD.c index 1aad8fd89..1aad8fd89 100755..100644 --- a/hicn-light/src/strategies/loadBalancerWithPD.c +++ b/hicn-light/src/strategies/loadBalancerWithPD.c diff --git a/hicn-light/src/strategies/loadBalancerWithPD.h b/hicn-light/src/strategies/loadBalancerWithPD.h index 6ea7f0785..6ea7f0785 100755..100644 --- a/hicn-light/src/strategies/loadBalancerWithPD.h +++ b/hicn-light/src/strategies/loadBalancerWithPD.h diff --git a/hicn-light/src/strategies/nexthopState.c b/hicn-light/src/strategies/nexthopState.c index ef0ffe982..ef0ffe982 100755..100644 --- a/hicn-light/src/strategies/nexthopState.c +++ b/hicn-light/src/strategies/nexthopState.c diff --git a/hicn-light/src/strategies/nexthopState.h b/hicn-light/src/strategies/nexthopState.h index 35a9f497b..35a9f497b 100755..100644 --- a/hicn-light/src/strategies/nexthopState.h +++ b/hicn-light/src/strategies/nexthopState.h diff --git a/hicn-light/src/strategies/nexthopStateWithPD.c b/hicn-light/src/strategies/nexthopStateWithPD.c index 2eecb0c64..2eecb0c64 100755..100644 --- a/hicn-light/src/strategies/nexthopStateWithPD.c +++ b/hicn-light/src/strategies/nexthopStateWithPD.c diff --git a/hicn-light/src/strategies/nexthopStateWithPD.h b/hicn-light/src/strategies/nexthopStateWithPD.h index 4d8bd6d15..4d8bd6d15 100755..100644 --- a/hicn-light/src/strategies/nexthopStateWithPD.h +++ b/hicn-light/src/strategies/nexthopStateWithPD.h diff --git a/hicn-light/src/strategies/rnd.c b/hicn-light/src/strategies/rnd.c index 37f3f6f30..37f3f6f30 100755..100644 --- a/hicn-light/src/strategies/rnd.c +++ b/hicn-light/src/strategies/rnd.c diff --git a/hicn-light/src/strategies/rnd.h b/hicn-light/src/strategies/rnd.h index 69bedc1a5..69bedc1a5 100755..100644 --- a/hicn-light/src/strategies/rnd.h +++ b/hicn-light/src/strategies/rnd.h diff --git a/hicn-light/src/strategies/rndSegment.c b/hicn-light/src/strategies/rndSegment.c index 2000ed7b7..2000ed7b7 100755..100644 --- a/hicn-light/src/strategies/rndSegment.c +++ b/hicn-light/src/strategies/rndSegment.c diff --git a/hicn-light/src/strategies/rndSegment.h b/hicn-light/src/strategies/rndSegment.h index 0749692f7..0749692f7 100755..100644 --- a/hicn-light/src/strategies/rndSegment.h +++ b/hicn-light/src/strategies/rndSegment.h diff --git a/hicn-light/src/strategies/strategyImpl.h b/hicn-light/src/strategies/strategyImpl.h index c089e0b2b..c089e0b2b 100755..100644 --- a/hicn-light/src/strategies/strategyImpl.h +++ b/hicn-light/src/strategies/strategyImpl.h diff --git a/hicn-light/src/utils/CMakeLists.txt b/hicn-light/src/utils/CMakeLists.txt index 7d438d157..7d438d157 100755..100644 --- a/hicn-light/src/utils/CMakeLists.txt +++ b/hicn-light/src/utils/CMakeLists.txt diff --git a/hicn-light/src/utils/address.c b/hicn-light/src/utils/address.c index 3f6fe2591..3f6fe2591 100755..100644 --- a/hicn-light/src/utils/address.c +++ b/hicn-light/src/utils/address.c diff --git a/hicn-light/src/utils/address.h b/hicn-light/src/utils/address.h index a98d15084..a98d15084 100755..100644 --- a/hicn-light/src/utils/address.h +++ b/hicn-light/src/utils/address.h diff --git a/hicn-light/src/utils/addressList.c b/hicn-light/src/utils/addressList.c index 4f51a11bf..4f51a11bf 100755..100644 --- a/hicn-light/src/utils/addressList.c +++ b/hicn-light/src/utils/addressList.c diff --git a/hicn-light/src/utils/addressList.h b/hicn-light/src/utils/addressList.h index bcb312c14..bcb312c14 100755..100644 --- a/hicn-light/src/utils/addressList.h +++ b/hicn-light/src/utils/addressList.h diff --git a/hicn-light/src/utils/commands.h b/hicn-light/src/utils/commands.h index 2f8ebcbfe..2f8ebcbfe 100755..100644 --- a/hicn-light/src/utils/commands.h +++ b/hicn-light/src/utils/commands.h diff --git a/hicn-light/src/utils/interface.c b/hicn-light/src/utils/interface.c index ab7a88f0f..ab7a88f0f 100755..100644 --- a/hicn-light/src/utils/interface.c +++ b/hicn-light/src/utils/interface.c diff --git a/hicn-light/src/utils/interface.h b/hicn-light/src/utils/interface.h index 0810ec053..0810ec053 100755..100644 --- a/hicn-light/src/utils/interface.h +++ b/hicn-light/src/utils/interface.h diff --git a/hicn-light/src/utils/interfaceSet.c b/hicn-light/src/utils/interfaceSet.c index 3f56ec167..3f56ec167 100755..100644 --- a/hicn-light/src/utils/interfaceSet.c +++ b/hicn-light/src/utils/interfaceSet.c diff --git a/hicn-light/src/utils/interfaceSet.h b/hicn-light/src/utils/interfaceSet.h index 8eb8397fb..8eb8397fb 100755..100644 --- a/hicn-light/src/utils/interfaceSet.h +++ b/hicn-light/src/utils/interfaceSet.h diff --git a/hicn-light/src/utils/punting.c b/hicn-light/src/utils/punting.c index 9352732fe..9352732fe 100755..100644 --- a/hicn-light/src/utils/punting.c +++ b/hicn-light/src/utils/punting.c diff --git a/hicn-light/src/utils/punting.h b/hicn-light/src/utils/punting.h index 03841c5ad..03841c5ad 100755..100644 --- a/hicn-light/src/utils/punting.h +++ b/hicn-light/src/utils/punting.h diff --git a/hicn-light/src/utils/utils.c b/hicn-light/src/utils/utils.c index a41478a4b..a41478a4b 100755..100644 --- a/hicn-light/src/utils/utils.c +++ b/hicn-light/src/utils/utils.c diff --git a/hicn-light/src/utils/utils.h b/hicn-light/src/utils/utils.h index 1d2616941..1d2616941 100755..100644 --- a/hicn-light/src/utils/utils.h +++ b/hicn-light/src/utils/utils.h diff --git a/hicn-plugin/AUTHORS b/hicn-plugin/AUTHORS index 9a3da8e21..9a3da8e21 100755..100644 --- a/hicn-plugin/AUTHORS +++ b/hicn-plugin/AUTHORS diff --git a/hicn-plugin/CMakeLists.txt b/hicn-plugin/CMakeLists.txt index aaa4136ff..aaa4136ff 100755..100644 --- a/hicn-plugin/CMakeLists.txt +++ b/hicn-plugin/CMakeLists.txt diff --git a/hicn-plugin/README.md b/hicn-plugin/README.md index 448130b51..448130b51 100755..100644 --- a/hicn-plugin/README.md +++ b/hicn-plugin/README.md diff --git a/hicn-plugin/src/cache_policies/cs_lru.c b/hicn-plugin/src/cache_policies/cs_lru.c index f35bee3c9..f35bee3c9 100755..100644 --- a/hicn-plugin/src/cache_policies/cs_lru.c +++ b/hicn-plugin/src/cache_policies/cs_lru.c diff --git a/hicn-plugin/src/cache_policies/cs_lru.h b/hicn-plugin/src/cache_policies/cs_lru.h index 94320f7f9..94320f7f9 100755..100644 --- a/hicn-plugin/src/cache_policies/cs_lru.h +++ b/hicn-plugin/src/cache_policies/cs_lru.h diff --git a/hicn-plugin/src/cache_policies/cs_policy.h b/hicn-plugin/src/cache_policies/cs_policy.h index 08817de18..08817de18 100755..100644 --- a/hicn-plugin/src/cache_policies/cs_policy.h +++ b/hicn-plugin/src/cache_policies/cs_policy.h diff --git a/hicn-plugin/src/cli.c b/hicn-plugin/src/cli.c index c8c0be4ff..c8c0be4ff 100755..100644 --- a/hicn-plugin/src/cli.c +++ b/hicn-plugin/src/cli.c diff --git a/hicn-plugin/src/data_fwd.h b/hicn-plugin/src/data_fwd.h index df74e9150..df74e9150 100755..100644 --- a/hicn-plugin/src/data_fwd.h +++ b/hicn-plugin/src/data_fwd.h diff --git a/hicn-plugin/src/data_fwd_node.c b/hicn-plugin/src/data_fwd_node.c index 1d37fdbcc..1d37fdbcc 100755..100644 --- a/hicn-plugin/src/data_fwd_node.c +++ b/hicn-plugin/src/data_fwd_node.c diff --git a/hicn-plugin/src/data_pcslookup.h b/hicn-plugin/src/data_pcslookup.h index fa75c3ac3..fa75c3ac3 100755..100644 --- a/hicn-plugin/src/data_pcslookup.h +++ b/hicn-plugin/src/data_pcslookup.h diff --git a/hicn-plugin/src/data_pcslookup_node.c b/hicn-plugin/src/data_pcslookup_node.c index 231d8557e..231d8557e 100755..100644 --- a/hicn-plugin/src/data_pcslookup_node.c +++ b/hicn-plugin/src/data_pcslookup_node.c diff --git a/hicn-plugin/src/data_push_node.c b/hicn-plugin/src/data_push_node.c index a4a25e29b..a4a25e29b 100755..100644 --- a/hicn-plugin/src/data_push_node.c +++ b/hicn-plugin/src/data_push_node.c diff --git a/hicn-plugin/src/error.c b/hicn-plugin/src/error.c index 588ae2398..588ae2398 100755..100644 --- a/hicn-plugin/src/error.c +++ b/hicn-plugin/src/error.c diff --git a/hicn-plugin/src/error.h b/hicn-plugin/src/error.h index 978c7f2ca..978c7f2ca 100755..100644 --- a/hicn-plugin/src/error.h +++ b/hicn-plugin/src/error.h diff --git a/hicn-plugin/src/face_db.h b/hicn-plugin/src/face_db.h index 5c95be334..5c95be334 100755..100644 --- a/hicn-plugin/src/face_db.h +++ b/hicn-plugin/src/face_db.h diff --git a/hicn-plugin/src/faces/app/address_mgr.c b/hicn-plugin/src/faces/app/address_mgr.c index 76a7e0f6d..76a7e0f6d 100755..100644 --- a/hicn-plugin/src/faces/app/address_mgr.c +++ b/hicn-plugin/src/faces/app/address_mgr.c diff --git a/hicn-plugin/src/faces/app/address_mgr.h b/hicn-plugin/src/faces/app/address_mgr.h index 99450dcdd..99450dcdd 100755..100644 --- a/hicn-plugin/src/faces/app/address_mgr.h +++ b/hicn-plugin/src/faces/app/address_mgr.h diff --git a/hicn-plugin/src/faces/app/face_app_cli.c b/hicn-plugin/src/faces/app/face_app_cli.c index d55e990de..d55e990de 100755..100644 --- a/hicn-plugin/src/faces/app/face_app_cli.c +++ b/hicn-plugin/src/faces/app/face_app_cli.c diff --git a/hicn-plugin/src/faces/app/face_cons.c b/hicn-plugin/src/faces/app/face_cons.c index 8278b6ab3..8278b6ab3 100755..100644 --- a/hicn-plugin/src/faces/app/face_cons.c +++ b/hicn-plugin/src/faces/app/face_cons.c diff --git a/hicn-plugin/src/faces/app/face_cons.h b/hicn-plugin/src/faces/app/face_cons.h index 067b45a1f..067b45a1f 100755..100644 --- a/hicn-plugin/src/faces/app/face_cons.h +++ b/hicn-plugin/src/faces/app/face_cons.h diff --git a/hicn-plugin/src/faces/app/face_prod.c b/hicn-plugin/src/faces/app/face_prod.c index d06fe2ff3..d06fe2ff3 100755..100644 --- a/hicn-plugin/src/faces/app/face_prod.c +++ b/hicn-plugin/src/faces/app/face_prod.c diff --git a/hicn-plugin/src/faces/app/face_prod.h b/hicn-plugin/src/faces/app/face_prod.h index 89b74680b..89b74680b 100755..100644 --- a/hicn-plugin/src/faces/app/face_prod.h +++ b/hicn-plugin/src/faces/app/face_prod.h diff --git a/hicn-plugin/src/faces/app/face_prod_node.c b/hicn-plugin/src/faces/app/face_prod_node.c index 2e746a703..2e746a703 100755..100644 --- a/hicn-plugin/src/faces/app/face_prod_node.c +++ b/hicn-plugin/src/faces/app/face_prod_node.c diff --git a/hicn-plugin/src/faces/face.c b/hicn-plugin/src/faces/face.c index f0559bb98..f0559bb98 100755..100644 --- a/hicn-plugin/src/faces/face.c +++ b/hicn-plugin/src/faces/face.c diff --git a/hicn-plugin/src/faces/face.h b/hicn-plugin/src/faces/face.h index b24fe8648..b24fe8648 100755..100644 --- a/hicn-plugin/src/faces/face.h +++ b/hicn-plugin/src/faces/face.h diff --git a/hicn-plugin/src/faces/face_cli.c b/hicn-plugin/src/faces/face_cli.c index 3ddf96beb..3ddf96beb 100755..100644 --- a/hicn-plugin/src/faces/face_cli.c +++ b/hicn-plugin/src/faces/face_cli.c diff --git a/hicn-plugin/src/faces/ip/dpo_ip.c b/hicn-plugin/src/faces/ip/dpo_ip.c index de71f1b01..de71f1b01 100755..100644 --- a/hicn-plugin/src/faces/ip/dpo_ip.c +++ b/hicn-plugin/src/faces/ip/dpo_ip.c diff --git a/hicn-plugin/src/faces/ip/dpo_ip.h b/hicn-plugin/src/faces/ip/dpo_ip.h index 426d5a146..426d5a146 100755..100644 --- a/hicn-plugin/src/faces/ip/dpo_ip.h +++ b/hicn-plugin/src/faces/ip/dpo_ip.h diff --git a/hicn-plugin/src/faces/ip/face_ip.c b/hicn-plugin/src/faces/ip/face_ip.c index c7f6a1ba1..c7f6a1ba1 100755..100644 --- a/hicn-plugin/src/faces/ip/face_ip.c +++ b/hicn-plugin/src/faces/ip/face_ip.c diff --git a/hicn-plugin/src/faces/ip/face_ip.h b/hicn-plugin/src/faces/ip/face_ip.h index 8c31f6dd3..8c31f6dd3 100755..100644 --- a/hicn-plugin/src/faces/ip/face_ip.h +++ b/hicn-plugin/src/faces/ip/face_ip.h diff --git a/hicn-plugin/src/faces/ip/face_ip_cli.c b/hicn-plugin/src/faces/ip/face_ip_cli.c index 1558c82cb..1558c82cb 100755..100644 --- a/hicn-plugin/src/faces/ip/face_ip_cli.c +++ b/hicn-plugin/src/faces/ip/face_ip_cli.c diff --git a/hicn-plugin/src/faces/ip/face_ip_node.c b/hicn-plugin/src/faces/ip/face_ip_node.c index b3577f65f..b3577f65f 100755..100644 --- a/hicn-plugin/src/faces/ip/face_ip_node.c +++ b/hicn-plugin/src/faces/ip/face_ip_node.c diff --git a/hicn-plugin/src/faces/ip/face_ip_node.h b/hicn-plugin/src/faces/ip/face_ip_node.h index 000395a04..000395a04 100755..100644 --- a/hicn-plugin/src/faces/ip/face_ip_node.h +++ b/hicn-plugin/src/faces/ip/face_ip_node.h diff --git a/hicn-plugin/src/faces/ip/iface_ip_node.c b/hicn-plugin/src/faces/ip/iface_ip_node.c index 9ca00d7bf..9ca00d7bf 100755..100644 --- a/hicn-plugin/src/faces/ip/iface_ip_node.c +++ b/hicn-plugin/src/faces/ip/iface_ip_node.c diff --git a/hicn-plugin/src/faces/ip/iface_ip_node.h b/hicn-plugin/src/faces/ip/iface_ip_node.h index 36923f069..36923f069 100755..100644 --- a/hicn-plugin/src/faces/ip/iface_ip_node.h +++ b/hicn-plugin/src/faces/ip/iface_ip_node.h diff --git a/hicn-plugin/src/faces/udp/dpo_udp.c b/hicn-plugin/src/faces/udp/dpo_udp.c index eadcb6abd..eadcb6abd 100755..100644 --- a/hicn-plugin/src/faces/udp/dpo_udp.c +++ b/hicn-plugin/src/faces/udp/dpo_udp.c diff --git a/hicn-plugin/src/faces/udp/dpo_udp.h b/hicn-plugin/src/faces/udp/dpo_udp.h index 33e4b5d46..33e4b5d46 100755..100644 --- a/hicn-plugin/src/faces/udp/dpo_udp.h +++ b/hicn-plugin/src/faces/udp/dpo_udp.h diff --git a/hicn-plugin/src/faces/udp/face_udp.c b/hicn-plugin/src/faces/udp/face_udp.c index 92335273a..92335273a 100755..100644 --- a/hicn-plugin/src/faces/udp/face_udp.c +++ b/hicn-plugin/src/faces/udp/face_udp.c diff --git a/hicn-plugin/src/faces/udp/face_udp.h b/hicn-plugin/src/faces/udp/face_udp.h index 8694bad5c..8694bad5c 100755..100644 --- a/hicn-plugin/src/faces/udp/face_udp.h +++ b/hicn-plugin/src/faces/udp/face_udp.h diff --git a/hicn-plugin/src/faces/udp/face_udp_cli.c b/hicn-plugin/src/faces/udp/face_udp_cli.c index 7bb172ce8..7bb172ce8 100755..100644 --- a/hicn-plugin/src/faces/udp/face_udp_cli.c +++ b/hicn-plugin/src/faces/udp/face_udp_cli.c diff --git a/hicn-plugin/src/faces/udp/face_udp_node.c b/hicn-plugin/src/faces/udp/face_udp_node.c index ac7a63731..ac7a63731 100755..100644 --- a/hicn-plugin/src/faces/udp/face_udp_node.c +++ b/hicn-plugin/src/faces/udp/face_udp_node.c diff --git a/hicn-plugin/src/faces/udp/face_udp_node.h b/hicn-plugin/src/faces/udp/face_udp_node.h index c759312c8..c759312c8 100755..100644 --- a/hicn-plugin/src/faces/udp/face_udp_node.h +++ b/hicn-plugin/src/faces/udp/face_udp_node.h diff --git a/hicn-plugin/src/faces/udp/iface_udp_node.c b/hicn-plugin/src/faces/udp/iface_udp_node.c index 1f6dbd4ab..1f6dbd4ab 100755..100644 --- a/hicn-plugin/src/faces/udp/iface_udp_node.c +++ b/hicn-plugin/src/faces/udp/iface_udp_node.c diff --git a/hicn-plugin/src/faces/udp/iface_udp_node.h b/hicn-plugin/src/faces/udp/iface_udp_node.h index 957d19217..957d19217 100755..100644 --- a/hicn-plugin/src/faces/udp/iface_udp_node.h +++ b/hicn-plugin/src/faces/udp/iface_udp_node.h diff --git a/hicn-plugin/src/hashtb.c b/hicn-plugin/src/hashtb.c index 0bdb91c0d..0bdb91c0d 100755..100644 --- a/hicn-plugin/src/hashtb.c +++ b/hicn-plugin/src/hashtb.c diff --git a/hicn-plugin/src/hashtb.h b/hicn-plugin/src/hashtb.h index b74e972b2..b74e972b2 100755..100644 --- a/hicn-plugin/src/hashtb.h +++ b/hicn-plugin/src/hashtb.h diff --git a/hicn-plugin/src/hicn.api b/hicn-plugin/src/hicn.api index e7d7d33c4..e7d7d33c4 100755..100644 --- a/hicn-plugin/src/hicn.api +++ b/hicn-plugin/src/hicn.api diff --git a/hicn-plugin/src/hicn.c b/hicn-plugin/src/hicn.c index a7b04de74..a7b04de74 100755..100644 --- a/hicn-plugin/src/hicn.c +++ b/hicn-plugin/src/hicn.c diff --git a/hicn-plugin/src/hicn.h b/hicn-plugin/src/hicn.h index c0de65de4..c0de65de4 100755..100644 --- a/hicn-plugin/src/hicn.h +++ b/hicn-plugin/src/hicn.h diff --git a/hicn-plugin/src/hicn_all_api_h.h b/hicn-plugin/src/hicn_all_api_h.h index 1263ea4a2..1263ea4a2 100755..100644 --- a/hicn-plugin/src/hicn_all_api_h.h +++ b/hicn-plugin/src/hicn_all_api_h.h diff --git a/hicn-plugin/src/hicn_api.c b/hicn-plugin/src/hicn_api.c index 8becde12c..8becde12c 100755..100644 --- a/hicn-plugin/src/hicn_api.c +++ b/hicn-plugin/src/hicn_api.c diff --git a/hicn-plugin/src/hicn_api.h b/hicn-plugin/src/hicn_api.h index 79b561be4..79b561be4 100755..100644 --- a/hicn-plugin/src/hicn_api.h +++ b/hicn-plugin/src/hicn_api.h diff --git a/hicn-plugin/src/hicn_api_test.c b/hicn-plugin/src/hicn_api_test.c index 9d4519bf4..9d4519bf4 100755..100644 --- a/hicn-plugin/src/hicn_api_test.c +++ b/hicn-plugin/src/hicn_api_test.c diff --git a/hicn-plugin/src/hicn_msg_enum.h b/hicn-plugin/src/hicn_msg_enum.h index 291e6226c..291e6226c 100755..100644 --- a/hicn-plugin/src/hicn_msg_enum.h +++ b/hicn-plugin/src/hicn_msg_enum.h diff --git a/hicn-plugin/src/infra.h b/hicn-plugin/src/infra.h index a9744fe97..a9744fe97 100755..100644 --- a/hicn-plugin/src/infra.h +++ b/hicn-plugin/src/infra.h diff --git a/hicn-plugin/src/interest_hitcs.h b/hicn-plugin/src/interest_hitcs.h index 82b0ace54..82b0ace54 100755..100644 --- a/hicn-plugin/src/interest_hitcs.h +++ b/hicn-plugin/src/interest_hitcs.h diff --git a/hicn-plugin/src/interest_hitcs_node.c b/hicn-plugin/src/interest_hitcs_node.c index 1d2255fcd..1d2255fcd 100755..100644 --- a/hicn-plugin/src/interest_hitcs_node.c +++ b/hicn-plugin/src/interest_hitcs_node.c diff --git a/hicn-plugin/src/interest_hitpit.h b/hicn-plugin/src/interest_hitpit.h index 28427d342..28427d342 100755..100644 --- a/hicn-plugin/src/interest_hitpit.h +++ b/hicn-plugin/src/interest_hitpit.h diff --git a/hicn-plugin/src/interest_hitpit_node.c b/hicn-plugin/src/interest_hitpit_node.c index 21ba97db3..21ba97db3 100755..100644 --- a/hicn-plugin/src/interest_hitpit_node.c +++ b/hicn-plugin/src/interest_hitpit_node.c diff --git a/hicn-plugin/src/interest_pcslookup.h b/hicn-plugin/src/interest_pcslookup.h index e27673a9e..e27673a9e 100755..100644 --- a/hicn-plugin/src/interest_pcslookup.h +++ b/hicn-plugin/src/interest_pcslookup.h diff --git a/hicn-plugin/src/interest_pcslookup_node.c b/hicn-plugin/src/interest_pcslookup_node.c index 40d62510b..40d62510b 100755..100644 --- a/hicn-plugin/src/interest_pcslookup_node.c +++ b/hicn-plugin/src/interest_pcslookup_node.c diff --git a/hicn-plugin/src/mapme.h b/hicn-plugin/src/mapme.h index e0786eff8..e0786eff8 100755..100644 --- a/hicn-plugin/src/mapme.h +++ b/hicn-plugin/src/mapme.h diff --git a/hicn-plugin/src/mapme_ack.h b/hicn-plugin/src/mapme_ack.h index 98a219982..98a219982 100755..100644 --- a/hicn-plugin/src/mapme_ack.h +++ b/hicn-plugin/src/mapme_ack.h diff --git a/hicn-plugin/src/mapme_ack_node.c b/hicn-plugin/src/mapme_ack_node.c index 21e177bb6..21e177bb6 100755..100644 --- a/hicn-plugin/src/mapme_ack_node.c +++ b/hicn-plugin/src/mapme_ack_node.c diff --git a/hicn-plugin/src/mapme_ctrl.h b/hicn-plugin/src/mapme_ctrl.h index e7c1cdf64..e7c1cdf64 100755..100644 --- a/hicn-plugin/src/mapme_ctrl.h +++ b/hicn-plugin/src/mapme_ctrl.h diff --git a/hicn-plugin/src/mapme_ctrl_node.c b/hicn-plugin/src/mapme_ctrl_node.c index 9fc0c9055..9fc0c9055 100755..100644 --- a/hicn-plugin/src/mapme_ctrl_node.c +++ b/hicn-plugin/src/mapme_ctrl_node.c diff --git a/hicn-plugin/src/mapme_eventmgr.c b/hicn-plugin/src/mapme_eventmgr.c index 5d5916403..5d5916403 100755..100644 --- a/hicn-plugin/src/mapme_eventmgr.c +++ b/hicn-plugin/src/mapme_eventmgr.c diff --git a/hicn-plugin/src/mapme_eventmgr.h b/hicn-plugin/src/mapme_eventmgr.h index 2f8106d6c..2f8106d6c 100755..100644 --- a/hicn-plugin/src/mapme_eventmgr.h +++ b/hicn-plugin/src/mapme_eventmgr.h diff --git a/hicn-plugin/src/mgmt.c b/hicn-plugin/src/mgmt.c index b992ba15c..b992ba15c 100755..100644 --- a/hicn-plugin/src/mgmt.c +++ b/hicn-plugin/src/mgmt.c diff --git a/hicn-plugin/src/mgmt.h b/hicn-plugin/src/mgmt.h index 08b1de089..08b1de089 100755..100644 --- a/hicn-plugin/src/mgmt.h +++ b/hicn-plugin/src/mgmt.h diff --git a/hicn-plugin/src/params.h b/hicn-plugin/src/params.h index 9e6ef5dbd..9e6ef5dbd 100755..100644 --- a/hicn-plugin/src/params.h +++ b/hicn-plugin/src/params.h diff --git a/hicn-plugin/src/parser.h b/hicn-plugin/src/parser.h index cbc5696ba..cbc5696ba 100755..100644 --- a/hicn-plugin/src/parser.h +++ b/hicn-plugin/src/parser.h diff --git a/hicn-plugin/src/pcs.c b/hicn-plugin/src/pcs.c index 4226291a1..4226291a1 100755..100644 --- a/hicn-plugin/src/pcs.c +++ b/hicn-plugin/src/pcs.c diff --git a/hicn-plugin/src/pcs.h b/hicn-plugin/src/pcs.h index 3ce40c9a3..3ce40c9a3 100755..100644 --- a/hicn-plugin/src/pcs.h +++ b/hicn-plugin/src/pcs.h diff --git a/hicn-plugin/src/pg.c b/hicn-plugin/src/pg.c index 643aff2be..643aff2be 100755..100644 --- a/hicn-plugin/src/pg.c +++ b/hicn-plugin/src/pg.c diff --git a/hicn-plugin/src/pg.h b/hicn-plugin/src/pg.h index 083afb6b3..083afb6b3 100755..100644 --- a/hicn-plugin/src/pg.h +++ b/hicn-plugin/src/pg.h diff --git a/hicn-plugin/src/punt.c b/hicn-plugin/src/punt.c index ea553bf76..ea553bf76 100755..100644 --- a/hicn-plugin/src/punt.c +++ b/hicn-plugin/src/punt.c diff --git a/hicn-plugin/src/punt.h b/hicn-plugin/src/punt.h index ebc27e9d4..ebc27e9d4 100755..100644 --- a/hicn-plugin/src/punt.h +++ b/hicn-plugin/src/punt.h diff --git a/hicn-plugin/src/route.c b/hicn-plugin/src/route.c index 9202efbd4..9202efbd4 100755..100644 --- a/hicn-plugin/src/route.c +++ b/hicn-plugin/src/route.c diff --git a/hicn-plugin/src/route.h b/hicn-plugin/src/route.h index be15b9906..be15b9906 100755..100644 --- a/hicn-plugin/src/route.h +++ b/hicn-plugin/src/route.h diff --git a/hicn-plugin/src/state.h b/hicn-plugin/src/state.h index 7e984e6c3..7e984e6c3 100755..100644 --- a/hicn-plugin/src/state.h +++ b/hicn-plugin/src/state.h diff --git a/hicn-plugin/src/strategies/dpo_mw.c b/hicn-plugin/src/strategies/dpo_mw.c index 882368e6e..882368e6e 100755..100644 --- a/hicn-plugin/src/strategies/dpo_mw.c +++ b/hicn-plugin/src/strategies/dpo_mw.c diff --git a/hicn-plugin/src/strategies/dpo_mw.h b/hicn-plugin/src/strategies/dpo_mw.h index a8c0a3b43..a8c0a3b43 100755..100644 --- a/hicn-plugin/src/strategies/dpo_mw.h +++ b/hicn-plugin/src/strategies/dpo_mw.h diff --git a/hicn-plugin/src/strategies/strategy_mw.c b/hicn-plugin/src/strategies/strategy_mw.c index fc7ef47fc..fc7ef47fc 100755..100644 --- a/hicn-plugin/src/strategies/strategy_mw.c +++ b/hicn-plugin/src/strategies/strategy_mw.c diff --git a/hicn-plugin/src/strategies/strategy_mw.h b/hicn-plugin/src/strategies/strategy_mw.h index 10b08c05f..10b08c05f 100755..100644 --- a/hicn-plugin/src/strategies/strategy_mw.h +++ b/hicn-plugin/src/strategies/strategy_mw.h diff --git a/hicn-plugin/src/strategies/strategy_mw_cli.c b/hicn-plugin/src/strategies/strategy_mw_cli.c index ff4125258..ff4125258 100755..100644 --- a/hicn-plugin/src/strategies/strategy_mw_cli.c +++ b/hicn-plugin/src/strategies/strategy_mw_cli.c diff --git a/hicn-plugin/src/strategy.c b/hicn-plugin/src/strategy.c index 247de9d07..247de9d07 100755..100644 --- a/hicn-plugin/src/strategy.c +++ b/hicn-plugin/src/strategy.c diff --git a/hicn-plugin/src/strategy.h b/hicn-plugin/src/strategy.h index a0100a4da..a0100a4da 100755..100644 --- a/hicn-plugin/src/strategy.h +++ b/hicn-plugin/src/strategy.h diff --git a/hicn-plugin/src/strategy_dpo_ctx.h b/hicn-plugin/src/strategy_dpo_ctx.h index 5d2dbc47c..5d2dbc47c 100755..100644 --- a/hicn-plugin/src/strategy_dpo_ctx.h +++ b/hicn-plugin/src/strategy_dpo_ctx.h diff --git a/hicn-plugin/src/strategy_dpo_manager.c b/hicn-plugin/src/strategy_dpo_manager.c index c1723eccc..c1723eccc 100755..100644 --- a/hicn-plugin/src/strategy_dpo_manager.c +++ b/hicn-plugin/src/strategy_dpo_manager.c diff --git a/hicn-plugin/src/strategy_dpo_manager.h b/hicn-plugin/src/strategy_dpo_manager.h index 686c2f8c8..686c2f8c8 100755..100644 --- a/hicn-plugin/src/strategy_dpo_manager.h +++ b/hicn-plugin/src/strategy_dpo_manager.h diff --git a/hicn-plugin/src/utils.h b/hicn-plugin/src/utils.h index ecad47e9b..ecad47e9b 100755..100644 --- a/hicn-plugin/src/utils.h +++ b/hicn-plugin/src/utils.h diff --git a/hicn-plugin/src/vface_db.h b/hicn-plugin/src/vface_db.h index b98a2f46d..b98a2f46d 100755..100644 --- a/hicn-plugin/src/vface_db.h +++ b/hicn-plugin/src/vface_db.h diff --git a/lib/CMakeLists.txt b/lib/CMakeLists.txt index 8b0280d7b..8b0280d7b 100755..100644 --- a/lib/CMakeLists.txt +++ b/lib/CMakeLists.txt diff --git a/lib/README.md b/lib/README.md index 6dac988db..6dac988db 100755..100644 --- a/lib/README.md +++ b/lib/README.md diff --git a/lib/doc/CMakeLists.txt b/lib/doc/CMakeLists.txt index cf022dc52..cf022dc52 100755..100644 --- a/lib/doc/CMakeLists.txt +++ b/lib/doc/CMakeLists.txt diff --git a/lib/doc/Doxyfile.in b/lib/doc/Doxyfile.in index 839de9f8a..839de9f8a 100755..100644 --- a/lib/doc/Doxyfile.in +++ b/lib/doc/Doxyfile.in diff --git a/lib/src/CMakeLists.txt b/lib/src/CMakeLists.txt index 7cd4ccdaa..7cd4ccdaa 100755..100644 --- a/lib/src/CMakeLists.txt +++ b/lib/src/CMakeLists.txt diff --git a/lib/src/base.h b/lib/src/base.h index 0fcf2a9c2..0fcf2a9c2 100755..100644 --- a/lib/src/base.h +++ b/lib/src/base.h diff --git a/lib/src/common.c b/lib/src/common.c index 4b7c4a2a7..4b7c4a2a7 100755..100644 --- a/lib/src/common.c +++ b/lib/src/common.c diff --git a/lib/src/common.h b/lib/src/common.h index dd488d43b..dd488d43b 100755..100644 --- a/lib/src/common.h +++ b/lib/src/common.h diff --git a/lib/src/compat.c b/lib/src/compat.c index 8b558a56e..8b558a56e 100755..100644 --- a/lib/src/compat.c +++ b/lib/src/compat.c diff --git a/lib/src/compat.h b/lib/src/compat.h index 1a1743de2..1a1743de2 100755..100644 --- a/lib/src/compat.h +++ b/lib/src/compat.h diff --git a/lib/src/error.c b/lib/src/error.c index 865e2b47d..865e2b47d 100755..100644 --- a/lib/src/error.c +++ b/lib/src/error.c diff --git a/lib/src/error.h b/lib/src/error.h index 3e027c4e5..3e027c4e5 100755..100644 --- a/lib/src/error.h +++ b/lib/src/error.h diff --git a/lib/src/header.h b/lib/src/header.h index 3864064f2..3864064f2 100755..100644 --- a/lib/src/header.h +++ b/lib/src/header.h diff --git a/lib/src/hicn.h b/lib/src/hicn.h index 749fd4247..749fd4247 100755..100644 --- a/lib/src/hicn.h +++ b/lib/src/hicn.h diff --git a/lib/src/mapme.c b/lib/src/mapme.c index e4c5ee1f2..e4c5ee1f2 100755..100644 --- a/lib/src/mapme.c +++ b/lib/src/mapme.c diff --git a/lib/src/mapme.h b/lib/src/mapme.h index 00c7ca798..00c7ca798 100755..100644 --- a/lib/src/mapme.h +++ b/lib/src/mapme.h diff --git a/lib/src/name.c b/lib/src/name.c index 6e5711252..6e5711252 100755..100644 --- a/lib/src/name.c +++ b/lib/src/name.c diff --git a/lib/src/name.h b/lib/src/name.h index ffcb4a451..ffcb4a451 100755..100644 --- a/lib/src/name.h +++ b/lib/src/name.h diff --git a/lib/src/ops.c b/lib/src/ops.c index ad45a13a5..ad45a13a5 100755..100644 --- a/lib/src/ops.c +++ b/lib/src/ops.c diff --git a/lib/src/ops.h b/lib/src/ops.h index b698a53fd..b698a53fd 100755..100644 --- a/lib/src/ops.h +++ b/lib/src/ops.h diff --git a/lib/src/protocol.h b/lib/src/protocol.h index a97cc99cf..a97cc99cf 100755..100644 --- a/lib/src/protocol.h +++ b/lib/src/protocol.h diff --git a/lib/src/protocol/ah.c b/lib/src/protocol/ah.c index f9ddf7775..f9ddf7775 100755..100644 --- a/lib/src/protocol/ah.c +++ b/lib/src/protocol/ah.c diff --git a/lib/src/protocol/ah.h b/lib/src/protocol/ah.h index 0b4171135..0b4171135 100755..100644 --- a/lib/src/protocol/ah.h +++ b/lib/src/protocol/ah.h diff --git a/lib/src/protocol/icmp.c b/lib/src/protocol/icmp.c index 44b646fb2..44b646fb2 100755..100644 --- a/lib/src/protocol/icmp.c +++ b/lib/src/protocol/icmp.c diff --git a/lib/src/protocol/icmp.h b/lib/src/protocol/icmp.h index 5a84995b6..5a84995b6 100755..100644 --- a/lib/src/protocol/icmp.h +++ b/lib/src/protocol/icmp.h diff --git a/lib/src/protocol/icmprd.h b/lib/src/protocol/icmprd.h index c2f27d673..c2f27d673 100755..100644 --- a/lib/src/protocol/icmprd.h +++ b/lib/src/protocol/icmprd.h diff --git a/lib/src/protocol/ipv4.c b/lib/src/protocol/ipv4.c index 7c6af127d..7c6af127d 100755..100644 --- a/lib/src/protocol/ipv4.c +++ b/lib/src/protocol/ipv4.c diff --git a/lib/src/protocol/ipv4.h b/lib/src/protocol/ipv4.h index c57485b6c..c57485b6c 100755..100644 --- a/lib/src/protocol/ipv4.h +++ b/lib/src/protocol/ipv4.h diff --git a/lib/src/protocol/ipv6.c b/lib/src/protocol/ipv6.c index 41b00ec92..41b00ec92 100755..100644 --- a/lib/src/protocol/ipv6.c +++ b/lib/src/protocol/ipv6.c diff --git a/lib/src/protocol/ipv6.h b/lib/src/protocol/ipv6.h index 28a1aa47f..28a1aa47f 100755..100644 --- a/lib/src/protocol/ipv6.h +++ b/lib/src/protocol/ipv6.h diff --git a/lib/src/protocol/tcp.c b/lib/src/protocol/tcp.c index 2afc4f6f4..2afc4f6f4 100755..100644 --- a/lib/src/protocol/tcp.c +++ b/lib/src/protocol/tcp.c diff --git a/lib/src/protocol/tcp.h b/lib/src/protocol/tcp.h index 68f4bf8f9..68f4bf8f9 100755..100644 --- a/lib/src/protocol/tcp.h +++ b/lib/src/protocol/tcp.h diff --git a/lib/src/protocol/udp.h b/lib/src/protocol/udp.h index 58cd65095..58cd65095 100755..100644 --- a/lib/src/protocol/udp.h +++ b/lib/src/protocol/udp.h diff --git a/libtransport/AUTHORS b/libtransport/AUTHORS index 12d1ae699..12d1ae699 100755..100644 --- a/libtransport/AUTHORS +++ b/libtransport/AUTHORS diff --git a/libtransport/CMakeLists.txt b/libtransport/CMakeLists.txt index 097ab03ab..c5cb95260 100755..100644 --- a/libtransport/CMakeLists.txt +++ b/libtransport/CMakeLists.txt @@ -59,6 +59,7 @@ if ((BUILD_MEMIF_CONNECTOR OR BUILD_VPP_PLUGIN) AND "${CMAKE_SYSTEM_NAME}" STREQ ) endif () +include(WindowsMacros) include(IosMacros) find_package_wrapper(Libparc REQUIRED) find_package_wrapper(Asio REQUIRED) @@ -102,6 +103,7 @@ list(APPEND LIBRARIES ${VPP_LIBRARIES} ${ANDROID_LIBRARIES} ${OPENSSL_LIBRARIES} + ${WINDOWS_LIBRARIES} ) # Include dirs -- Order does matter! @@ -111,6 +113,7 @@ list(APPEND LIBTRANSPORT_INCLUDE_DIRS ${LIBPARC_INCLUDE_DIRS} ${CMAKE_THREADS_INCLUDE_DIRS} ${ASIO_INCLUDE_DIRS} + ${WINDOWS_INCLUDE_DIRS} ) add_subdirectory(${TRANSPORT_ROOT_PATH})
\ No newline at end of file diff --git a/libtransport/README.md b/libtransport/README.md index e7fc267ee..e7fc267ee 100755..100644 --- a/libtransport/README.md +++ b/libtransport/README.md diff --git a/libtransport/cmake/Modules/Android.cmake b/libtransport/cmake/Modules/Android.cmake index 78918455a..78918455a 100755..100644 --- a/libtransport/cmake/Modules/Android.cmake +++ b/libtransport/cmake/Modules/Android.cmake diff --git a/libtransport/cmake/Modules/DefaultConfiguration.cmake b/libtransport/cmake/Modules/DefaultConfiguration.cmake index 2110ac0fb..2110ac0fb 100755..100644 --- a/libtransport/cmake/Modules/DefaultConfiguration.cmake +++ b/libtransport/cmake/Modules/DefaultConfiguration.cmake diff --git a/libtransport/cmake/Modules/Ios.cmake b/libtransport/cmake/Modules/Ios.cmake index a4e625e98..a4e625e98 100755..100644 --- a/libtransport/cmake/Modules/Ios.cmake +++ b/libtransport/cmake/Modules/Ios.cmake diff --git a/libtransport/cmake/Modules/Packaging.cmake b/libtransport/cmake/Modules/Packaging.cmake index 64d1dd325..64d1dd325 100755..100644 --- a/libtransport/cmake/Modules/Packaging.cmake +++ b/libtransport/cmake/Modules/Packaging.cmake diff --git a/libtransport/cmake/Modules/TestMacros.cmake b/libtransport/cmake/Modules/TestMacros.cmake index 680b5585f..680b5585f 100755..100644 --- a/libtransport/cmake/Modules/TestMacros.cmake +++ b/libtransport/cmake/Modules/TestMacros.cmake diff --git a/libtransport/src/hicn/transport/CMakeLists.txt b/libtransport/src/hicn/transport/CMakeLists.txt index fd5721273..fd5721273 100755..100644 --- a/libtransport/src/hicn/transport/CMakeLists.txt +++ b/libtransport/src/hicn/transport/CMakeLists.txt diff --git a/libtransport/src/hicn/transport/config.h.in b/libtransport/src/hicn/transport/config.h.in index a140f4b78..a140f4b78 100755..100644 --- a/libtransport/src/hicn/transport/config.h.in +++ b/libtransport/src/hicn/transport/config.h.in diff --git a/libtransport/src/hicn/transport/core/CMakeLists.txt b/libtransport/src/hicn/transport/core/CMakeLists.txt index a97e74b2a..a97e74b2a 100755..100644 --- a/libtransport/src/hicn/transport/core/CMakeLists.txt +++ b/libtransport/src/hicn/transport/core/CMakeLists.txt diff --git a/libtransport/src/hicn/transport/core/content_object.cc b/libtransport/src/hicn/transport/core/content_object.cc index dc2056582..4cd5623c4 100644 --- a/libtransport/src/hicn/transport/core/content_object.cc +++ b/libtransport/src/hicn/transport/core/content_object.cc @@ -18,7 +18,9 @@ #include <hicn/transport/utils/branch_prediction.h> extern "C" { +#ifndef _WIN32 TRANSPORT_CLANG_DISABLE_WARNING("-Wextern-c-compat") +#endif #include <hicn/hicn.h> } diff --git a/libtransport/src/hicn/transport/core/hicn_forwarder_interface.cc b/libtransport/src/hicn/transport/core/hicn_forwarder_interface.cc index 1d82ff0b0..e8b38cd7b 100644 --- a/libtransport/src/hicn/transport/core/hicn_forwarder_interface.cc +++ b/libtransport/src/hicn/transport/core/hicn_forwarder_interface.cc @@ -15,7 +15,6 @@ #include <hicn/transport/core/hicn_forwarder_interface.h> - #define ADDR_INET 1 #define ADDR_INET6 2 #define ADD_ROUTE 3 diff --git a/libtransport/src/hicn/transport/core/interest.cc b/libtransport/src/hicn/transport/core/interest.cc index ff4a5bb34..4ea0c4419 100644 --- a/libtransport/src/hicn/transport/core/interest.cc +++ b/libtransport/src/hicn/transport/core/interest.cc @@ -18,7 +18,9 @@ #include <hicn/transport/utils/hash.h> extern "C" { +#ifndef _WIN32 TRANSPORT_CLANG_DISABLE_WARNING("-Wextern-c-compat") +#endif #include <hicn/hicn.h> } diff --git a/libtransport/src/hicn/transport/core/name.h b/libtransport/src/hicn/transport/core/name.h index b0da15026..b2f913986 100644 --- a/libtransport/src/hicn/transport/core/name.h +++ b/libtransport/src/hicn/transport/core/name.h @@ -24,7 +24,9 @@ #include <unordered_map> extern "C" { +#ifndef _WIN32 TRANSPORT_CLANG_DISABLE_WARNING("-Wextern-c-compat") +#endif #include <hicn/hicn.h> }; diff --git a/libtransport/src/hicn/transport/core/packet.cc b/libtransport/src/hicn/transport/core/packet.cc index 69cbb3cb3..dd150d723 100644 --- a/libtransport/src/hicn/transport/core/packet.cc +++ b/libtransport/src/hicn/transport/core/packet.cc @@ -19,7 +19,9 @@ #include <hicn/transport/utils/log.h> extern "C" { +#ifndef _WIN32 TRANSPORT_CLANG_DISABLE_WARNING("-Wextern-c-compat") +#endif #include <hicn/error.h> } diff --git a/libtransport/src/hicn/transport/core/pending_interest.cc b/libtransport/src/hicn/transport/core/pending_interest.cc index a2df9ba44..73bc41e87 100644 --- a/libtransport/src/hicn/transport/core/pending_interest.cc +++ b/libtransport/src/hicn/transport/core/pending_interest.cc @@ -34,10 +34,10 @@ PendingInterest::PendingInterest(Interest::Ptr &&interest, on_interest_timeout_callback_(), received_(false) {} -PendingInterest::PendingInterest(Interest::Ptr &&interest, - const OnContentObjectCallback &&on_content_object, - const OnInterestTimeoutCallback &&on_interest_timeout, - std::unique_ptr<asio::steady_timer> &&timer) +PendingInterest::PendingInterest( + Interest::Ptr &&interest, const OnContentObjectCallback &&on_content_object, + const OnInterestTimeoutCallback &&on_interest_timeout, + std::unique_ptr<asio::steady_timer> &&timer) : interest_(std::move(interest)), timer_(std::move(timer)), on_content_object_callback_(std::move(on_content_object)), @@ -60,7 +60,8 @@ const OnContentObjectCallback &PendingInterest::getOnDataCallback() const { return on_content_object_callback_; } -void PendingInterest::setOnDataCallback(const OnContentObjectCallback &on_content_object) { +void PendingInterest::setOnDataCallback( + const OnContentObjectCallback &on_content_object) { PendingInterest::on_content_object_callback_ = on_content_object; } @@ -68,7 +69,8 @@ const OnInterestTimeoutCallback &PendingInterest::getOnTimeoutCallback() const { return on_interest_timeout_callback_; } -void PendingInterest::setOnTimeoutCallback(const OnInterestTimeoutCallback &on_interest_timeout) { +void PendingInterest::setOnTimeoutCallback( + const OnInterestTimeoutCallback &on_interest_timeout) { PendingInterest::on_interest_timeout_callback_ = on_interest_timeout; } diff --git a/libtransport/src/hicn/transport/core/pending_interest.h b/libtransport/src/hicn/transport/core/pending_interest.h index 58b51db79..9a26c7b2b 100644 --- a/libtransport/src/hicn/transport/core/pending_interest.h +++ b/libtransport/src/hicn/transport/core/pending_interest.h @@ -34,8 +34,9 @@ class RawSocketInterface; template <typename ForwarderInt> class Portal; -typedef std::function<void(Interest::Ptr&&, ContentObject::Ptr&&)> OnContentObjectCallback; -typedef std::function<void(Interest::Ptr&&)> OnInterestTimeoutCallback; +typedef std::function<void(Interest::Ptr &&, ContentObject::Ptr &&)> + OnContentObjectCallback; +typedef std::function<void(Interest::Ptr &&)> OnInterestTimeoutCallback; typedef std::function<void(const std::error_code &)> TimerCallback; class PendingInterest { @@ -77,7 +78,8 @@ class PendingInterest { const OnInterestTimeoutCallback &getOnTimeoutCallback() const; - void setOnTimeoutCallback(const OnInterestTimeoutCallback &on_interest_timeout); + void setOnTimeoutCallback( + const OnInterestTimeoutCallback &on_interest_timeout); private: Interest::Ptr interest_; diff --git a/libtransport/src/hicn/transport/core/portal.h b/libtransport/src/hicn/transport/core/portal.h index 58406bbde..0932b56c6 100644 --- a/libtransport/src/hicn/transport/core/portal.h +++ b/libtransport/src/hicn/transport/core/portal.h @@ -127,9 +127,7 @@ class Portal { forwarder_interface_.connect(is_consumer); } - ~Portal() { - stopEventsLoop(true); - } + ~Portal() { stopEventsLoop(true); } TRANSPORT_ALWAYS_INLINE bool interestIsPending(const Name &name) { auto it = pending_interest_hash_table_.find(name); @@ -153,10 +151,10 @@ class Portal { std::placeholders::_1, name)); } - TRANSPORT_ALWAYS_INLINE void sendInterest(Interest::Ptr &&interest, - const OnContentObjectCallback &&on_content_object_callback, - const OnInterestTimeoutCallback &&on_interest_timeout_callback) { - + TRANSPORT_ALWAYS_INLINE void sendInterest( + Interest::Ptr &&interest, + const OnContentObjectCallback &&on_content_object_callback, + const OnInterestTimeoutCallback &&on_interest_timeout_callback) { const Name name(interest->getName(), true); // Send it @@ -168,9 +166,8 @@ class Portal { std::make_unique<asio::steady_timer>(io_service_)); pending_interest_hash_table_[name]->startCountdown( - std::bind(&Portal<ForwarderInt>::timerHandler, - this, std::placeholders::_1, name)); - + std::bind(&Portal<ForwarderInt>::timerHandler, this, + std::placeholders::_1, name)); } TRANSPORT_ALWAYS_INLINE void timerHandler(const std::error_code &ec, @@ -187,9 +184,9 @@ class Portal { std::unique_ptr<PendingInterest> ptr = std::move(it->second); pending_interest_hash_table_.erase(it); - if(ptr->getOnTimeoutCallback() != UNSET_CALLBACK){ - ptr->on_interest_timeout_callback_(std::move(ptr->getInterest())); - }else if (consumer_callback_) { + if (ptr->getOnTimeoutCallback() != UNSET_CALLBACK) { + ptr->on_interest_timeout_callback_(std::move(ptr->getInterest())); + } else if (consumer_callback_) { consumer_callback_->onTimeout(std::move(ptr->getInterest())); } } @@ -231,7 +228,7 @@ class Portal { clear(); - if(kill_connection) { + if (kill_connection) { connector_.close(); } @@ -310,11 +307,11 @@ class Portal { interest_ptr->setReceived(); pending_interest_hash_table_.erase(content_object->getName()); - if(interest_ptr->getOnDataCallback() != UNSET_CALLBACK){ - interest_ptr->on_content_object_callback_( - std::move(interest_ptr->getInterest()), - std::move(content_object)); - }else if (consumer_callback_) { + if (interest_ptr->getOnDataCallback() != UNSET_CALLBACK) { + interest_ptr->on_content_object_callback_( + std::move(interest_ptr->getInterest()), + std::move(content_object)); + } else if (consumer_callback_) { consumer_callback_->onContentObject( std::move(interest_ptr->getInterest()), std::move(content_object)); diff --git a/libtransport/src/hicn/transport/core/prefix.cc b/libtransport/src/hicn/transport/core/prefix.cc index 69c2b845a..575bcc2ed 100644 --- a/libtransport/src/hicn/transport/core/prefix.cc +++ b/libtransport/src/hicn/transport/core/prefix.cc @@ -17,9 +17,13 @@ #include <hicn/transport/errors/errors.h> #include <hicn/transport/utils/string_tokenizer.h> +#ifndef _WIN32 extern "C" { #include <arpa/inet.h> } +#else +#include <hicn/transport/portability/win_portability.h> +#endif #include <cstring> #include <memory> diff --git a/libtransport/src/hicn/transport/core/socket_connector.cc b/libtransport/src/hicn/transport/core/socket_connector.cc index 704d3badb..84a843f14 100644 --- a/libtransport/src/hicn/transport/core/socket_connector.cc +++ b/libtransport/src/hicn/transport/core/socket_connector.cc @@ -13,6 +13,9 @@ * limitations under the License. */ +#ifdef _WIN32 +#include <hicn/transport/portability/win_portability.h> +#endif #include <hicn/transport/core/socket_connector.h> #include <hicn/transport/errors/errors.h> #include <hicn/transport/utils/log.h> @@ -130,7 +133,8 @@ void SocketConnector::doWrite() { if (!output_buffer_.empty()) { doWrite(); } - } else if (ec.value() == static_cast<int>(std::errc::operation_canceled)) { + } else if (ec.value() == + static_cast<int>(std::errc::operation_canceled)) { // The connection has been closed by the application. return; } else { @@ -149,7 +153,8 @@ void SocketConnector::doReadBody(std::size_t body_length) { if (TRANSPORT_EXPECT_TRUE(!ec)) { receive_callback_(std::move(read_msg_)); doReadHeader(); - } else if (ec.value() == static_cast<int>(std::errc::operation_canceled)) { + } else if (ec.value() == + static_cast<int>(std::errc::operation_canceled)) { // The connection has been closed by the application. return; } else { @@ -176,7 +181,8 @@ void SocketConnector::doReadHeader() { } else { TRANSPORT_LOGE("Decoding error. Ignoring packet."); } - } else if (ec.value() == static_cast<int>(std::errc::operation_canceled)) { + } else if (ec.value() == + static_cast<int>(std::errc::operation_canceled)) { // The connection has been closed by the application. return; } else { diff --git a/libtransport/src/hicn/transport/core/socket_connector.h b/libtransport/src/hicn/transport/core/socket_connector.h index e014111e2..6eff1aff5 100644 --- a/libtransport/src/hicn/transport/core/socket_connector.h +++ b/libtransport/src/hicn/transport/core/socket_connector.h @@ -19,8 +19,8 @@ #include <hicn/transport/core/name.h> #include <hicn/transport/utils/branch_prediction.h> -#include <asio/steady_timer.hpp> #include <asio.hpp> +#include <asio/steady_timer.hpp> #include <deque> namespace transport { diff --git a/libtransport/src/hicn/transport/core/test/CMakeLists.txt b/libtransport/src/hicn/transport/core/test/CMakeLists.txt index 48c50e9b0..48c50e9b0 100755..100644 --- a/libtransport/src/hicn/transport/core/test/CMakeLists.txt +++ b/libtransport/src/hicn/transport/core/test/CMakeLists.txt diff --git a/libtransport/src/hicn/transport/core/vpp_forwarder_interface.cc b/libtransport/src/hicn/transport/core/vpp_forwarder_interface.cc index 0335c3829..828e31a0a 100644 --- a/libtransport/src/hicn/transport/core/vpp_forwarder_interface.cc +++ b/libtransport/src/hicn/transport/core/vpp_forwarder_interface.cc @@ -45,7 +45,8 @@ VPPForwarderInterface::VPPForwarderInterface(MemifConnector &connector) VPPForwarderInterface::~VPPForwarderInterface() { if (sw_if_index_ != uint32_t(~0) && VPPForwarderInterface::memif_api_) { - int ret = memif_binary_api_delete_memif(VPPForwarderInterface::memif_api_, sw_if_index_); + int ret = memif_binary_api_delete_memif(VPPForwarderInterface::memif_api_, + sw_if_index_); if (ret < 0) { TRANSPORT_LOGE("Error deleting memif with sw idx %u.", sw_if_index_); @@ -82,7 +83,7 @@ uint32_t VPPForwarderInterface::getMemifConfiguration() { memif_output_params_t output_params = {0}; ret = memif_binary_api_create_memif(VPPForwarderInterface::memif_api_, - &input_params, &output_params); + &input_params, &output_params); if (ret < 0) { throw errors::RuntimeException( @@ -105,8 +106,8 @@ void VPPForwarderInterface::consumerConnection() { input.swif = sw_if_index_; - int ret = hicn_binary_api_register_cons_app( - VPPForwarderInterface::hicn_api_, &input, &output); + int ret = hicn_binary_api_register_cons_app(VPPForwarderInterface::hicn_api_, + &input, &output); if (ret < 0) { throw errors::RuntimeException(hicn_binary_api_get_error_string(ret)); @@ -178,7 +179,7 @@ void VPPForwarderInterface::registerRoute(Prefix &prefix) { input.cs_reserved = content_store_reserved_; int ret = hicn_binary_api_register_prod_app( - VPPForwarderInterface::hicn_api_, &input, &output); + VPPForwarderInterface::hicn_api_, &input, &output); if (ret < 0) { throw errors::RuntimeException(hicn_binary_api_get_error_string(ret)); @@ -206,8 +207,8 @@ void VPPForwarderInterface::registerRoute(Prefix &prefix) { params.prefix->prefix_len = addr.prefix_len; params.face_id = face_id_; - int ret = hicn_binary_api_register_route( - VPPForwarderInterface::hicn_api_, ¶ms); + int ret = hicn_binary_api_register_route(VPPForwarderInterface::hicn_api_, + ¶ms); if (ret < 0) { throw errors::RuntimeException(hicn_binary_api_get_error_string(ret)); diff --git a/libtransport/src/hicn/transport/errors/CMakeLists.txt b/libtransport/src/hicn/transport/errors/CMakeLists.txt index 1c19a9070..1c19a9070 100755..100644 --- a/libtransport/src/hicn/transport/errors/CMakeLists.txt +++ b/libtransport/src/hicn/transport/errors/CMakeLists.txt diff --git a/libtransport/src/hicn/transport/errors/errors.h b/libtransport/src/hicn/transport/errors/errors.h index 512e35736..512e35736 100755..100644 --- a/libtransport/src/hicn/transport/errors/errors.h +++ b/libtransport/src/hicn/transport/errors/errors.h diff --git a/libtransport/src/hicn/transport/errors/invalid_ip_address_exception.h b/libtransport/src/hicn/transport/errors/invalid_ip_address_exception.h index 60226f576..60226f576 100755..100644 --- a/libtransport/src/hicn/transport/errors/invalid_ip_address_exception.h +++ b/libtransport/src/hicn/transport/errors/invalid_ip_address_exception.h diff --git a/libtransport/src/hicn/transport/errors/malformed_ahpacket_exception.h b/libtransport/src/hicn/transport/errors/malformed_ahpacket_exception.h index f0cfe0b82..f0cfe0b82 100755..100644 --- a/libtransport/src/hicn/transport/errors/malformed_ahpacket_exception.h +++ b/libtransport/src/hicn/transport/errors/malformed_ahpacket_exception.h diff --git a/libtransport/src/hicn/transport/errors/malformed_name_exception.h b/libtransport/src/hicn/transport/errors/malformed_name_exception.h index 4ef45d2e8..4ef45d2e8 100755..100644 --- a/libtransport/src/hicn/transport/errors/malformed_name_exception.h +++ b/libtransport/src/hicn/transport/errors/malformed_name_exception.h diff --git a/libtransport/src/hicn/transport/errors/malformed_packet_exception.h b/libtransport/src/hicn/transport/errors/malformed_packet_exception.h index ec5c97e6e..ec5c97e6e 100755..100644 --- a/libtransport/src/hicn/transport/errors/malformed_packet_exception.h +++ b/libtransport/src/hicn/transport/errors/malformed_packet_exception.h diff --git a/libtransport/src/hicn/transport/errors/not_implemented_exception.h b/libtransport/src/hicn/transport/errors/not_implemented_exception.h index e9869163d..e9869163d 100755..100644 --- a/libtransport/src/hicn/transport/errors/not_implemented_exception.h +++ b/libtransport/src/hicn/transport/errors/not_implemented_exception.h diff --git a/libtransport/src/hicn/transport/errors/null_pointer_exception.h b/libtransport/src/hicn/transport/errors/null_pointer_exception.h index bd06485ed..bd06485ed 100755..100644 --- a/libtransport/src/hicn/transport/errors/null_pointer_exception.h +++ b/libtransport/src/hicn/transport/errors/null_pointer_exception.h diff --git a/libtransport/src/hicn/transport/errors/runtime_exception.h b/libtransport/src/hicn/transport/errors/runtime_exception.h index ba5128a7e..ba5128a7e 100755..100644 --- a/libtransport/src/hicn/transport/errors/runtime_exception.h +++ b/libtransport/src/hicn/transport/errors/runtime_exception.h diff --git a/libtransport/src/hicn/transport/errors/tokenizer_exception.h b/libtransport/src/hicn/transport/errors/tokenizer_exception.h index 76eda838e..76eda838e 100755..100644 --- a/libtransport/src/hicn/transport/errors/tokenizer_exception.h +++ b/libtransport/src/hicn/transport/errors/tokenizer_exception.h diff --git a/libtransport/src/hicn/transport/http/CMakeLists.txt b/libtransport/src/hicn/transport/http/CMakeLists.txt index ddcf1fdc3..ddcf1fdc3 100755..100644 --- a/libtransport/src/hicn/transport/http/CMakeLists.txt +++ b/libtransport/src/hicn/transport/http/CMakeLists.txt diff --git a/libtransport/src/hicn/transport/http/callbacks.h b/libtransport/src/hicn/transport/http/callbacks.h index 5ca5fcbe2..5ca5fcbe2 100755..100644 --- a/libtransport/src/hicn/transport/http/callbacks.h +++ b/libtransport/src/hicn/transport/http/callbacks.h diff --git a/libtransport/src/hicn/transport/http/client_connection.cc b/libtransport/src/hicn/transport/http/client_connection.cc index d4207bb81..d4207bb81 100755..100644 --- a/libtransport/src/hicn/transport/http/client_connection.cc +++ b/libtransport/src/hicn/transport/http/client_connection.cc diff --git a/libtransport/src/hicn/transport/http/client_connection.h b/libtransport/src/hicn/transport/http/client_connection.h index f6e1fa03e..f6e1fa03e 100755..100644 --- a/libtransport/src/hicn/transport/http/client_connection.h +++ b/libtransport/src/hicn/transport/http/client_connection.h diff --git a/libtransport/src/hicn/transport/http/default_values.h b/libtransport/src/hicn/transport/http/default_values.h index 2d5a6b821..2d5a6b821 100755..100644 --- a/libtransport/src/hicn/transport/http/default_values.h +++ b/libtransport/src/hicn/transport/http/default_values.h diff --git a/libtransport/src/hicn/transport/http/facade.h b/libtransport/src/hicn/transport/http/facade.h index 31c2d1b8d..31c2d1b8d 100755..100644 --- a/libtransport/src/hicn/transport/http/facade.h +++ b/libtransport/src/hicn/transport/http/facade.h diff --git a/libtransport/src/hicn/transport/http/message.h b/libtransport/src/hicn/transport/http/message.h index 7d4485c90..b2f271bcb 100755..100644 --- a/libtransport/src/hicn/transport/http/message.h +++ b/libtransport/src/hicn/transport/http/message.h @@ -15,6 +15,10 @@ #pragma once +#ifdef _WIN32 +#include <hicn/transport/portability/win_portability.h> +#endif + #include <hicn/transport/utils/sharable_vector.h> #include <map> diff --git a/libtransport/src/hicn/transport/http/request.cc b/libtransport/src/hicn/transport/http/request.cc index 7a63b4f75..7a63b4f75 100755..100644 --- a/libtransport/src/hicn/transport/http/request.cc +++ b/libtransport/src/hicn/transport/http/request.cc diff --git a/libtransport/src/hicn/transport/http/request.h b/libtransport/src/hicn/transport/http/request.h index 88d67d4ad..88d67d4ad 100755..100644 --- a/libtransport/src/hicn/transport/http/request.h +++ b/libtransport/src/hicn/transport/http/request.h diff --git a/libtransport/src/hicn/transport/http/response.cc b/libtransport/src/hicn/transport/http/response.cc index 0aa9affe8..0aa9affe8 100755..100644 --- a/libtransport/src/hicn/transport/http/response.cc +++ b/libtransport/src/hicn/transport/http/response.cc diff --git a/libtransport/src/hicn/transport/http/response.h b/libtransport/src/hicn/transport/http/response.h index e7dec8c40..e7dec8c40 100755..100644 --- a/libtransport/src/hicn/transport/http/response.h +++ b/libtransport/src/hicn/transport/http/response.h diff --git a/libtransport/src/hicn/transport/http/server_acceptor.cc b/libtransport/src/hicn/transport/http/server_acceptor.cc index 717dfb642..717dfb642 100755..100644 --- a/libtransport/src/hicn/transport/http/server_acceptor.cc +++ b/libtransport/src/hicn/transport/http/server_acceptor.cc diff --git a/libtransport/src/hicn/transport/http/server_acceptor.h b/libtransport/src/hicn/transport/http/server_acceptor.h index 549962414..549962414 100755..100644 --- a/libtransport/src/hicn/transport/http/server_acceptor.h +++ b/libtransport/src/hicn/transport/http/server_acceptor.h diff --git a/libtransport/src/hicn/transport/http/server_publisher.cc b/libtransport/src/hicn/transport/http/server_publisher.cc index 012f36091..012f36091 100755..100644 --- a/libtransport/src/hicn/transport/http/server_publisher.cc +++ b/libtransport/src/hicn/transport/http/server_publisher.cc diff --git a/libtransport/src/hicn/transport/http/server_publisher.h b/libtransport/src/hicn/transport/http/server_publisher.h index 91f7e43e9..91f7e43e9 100755..100644 --- a/libtransport/src/hicn/transport/http/server_publisher.h +++ b/libtransport/src/hicn/transport/http/server_publisher.h diff --git a/libtransport/src/hicn/transport/interfaces/CMakeLists.txt b/libtransport/src/hicn/transport/interfaces/CMakeLists.txt index cbf371bac..cbf371bac 100755..100644 --- a/libtransport/src/hicn/transport/interfaces/CMakeLists.txt +++ b/libtransport/src/hicn/transport/interfaces/CMakeLists.txt diff --git a/libtransport/src/hicn/transport/interfaces/async_transport.h b/libtransport/src/hicn/transport/interfaces/async_transport.h index 492b4ec26..2911377a4 100755..100644 --- a/libtransport/src/hicn/transport/interfaces/async_transport.h +++ b/libtransport/src/hicn/transport/interfaces/async_transport.h @@ -20,7 +20,10 @@ #include <hicn/transport/portability/portability.h> #include <hicn/transport/utils/sharable_vector.h> +#ifndef _WIN32 #include <sys/uio.h> +#endif + #include <memory> namespace transport { diff --git a/libtransport/src/hicn/transport/interfaces/full_duplex_socket.cc b/libtransport/src/hicn/transport/interfaces/full_duplex_socket.cc index e06858cc3..0a091d94e 100644 --- a/libtransport/src/hicn/transport/interfaces/full_duplex_socket.cc +++ b/libtransport/src/hicn/transport/interfaces/full_duplex_socket.cc @@ -57,21 +57,23 @@ AsyncFullDuplexSocket::AsyncFullDuplexSocket(const Prefix &locator, producer_->setSocketOption(GeneralTransportOptions::OUTPUT_BUFFER_SIZE, uint32_t{150000}); - producer_->setSocketOption( - ProducerCallbacksOptions::CONTENT_PRODUCED, - std::bind(&AsyncFullDuplexSocket::onContentProduced, this, _1, _2, _3)); + ProducerContentCallback producer_callback = + std::bind(&AsyncFullDuplexSocket::onContentProduced, this, _1, _2, _3); + producer_->setSocketOption(ProducerCallbacksOptions::CONTENT_PRODUCED, + producer_callback); producer_->connect(); - consumer_->setSocketOption(ConsumerCallbacksOptions::CONTENT_OBJECT_TO_VERIFY, - (ConsumerContentObjectVerificationCallback)[]( - ConsumerSocket & s, const ContentObject &c) - ->bool { return true; }); + consumer_->setSocketOption( + ConsumerCallbacksOptions::CONTENT_OBJECT_TO_VERIFY, + (ConsumerContentObjectVerificationCallback)[](ConsumerSocket & s, + const ContentObject &c) + ->bool { return true; }); - ConsumerContentCallback callback = + ConsumerContentCallback consumer_callback = std::bind(&AsyncFullDuplexSocket::onContentRetrieved, this, _1, _2, _3); consumer_->setSocketOption(ConsumerCallbacksOptions::CONTENT_RETRIEVED, - callback); + consumer_callback); consumer_->setSocketOption(GeneralTransportOptions::MAX_INTEREST_RETX, uint32_t{4}); diff --git a/libtransport/src/hicn/transport/interfaces/full_duplex_socket.h b/libtransport/src/hicn/transport/interfaces/full_duplex_socket.h index f881bea54..f881bea54 100755..100644 --- a/libtransport/src/hicn/transport/interfaces/full_duplex_socket.h +++ b/libtransport/src/hicn/transport/interfaces/full_duplex_socket.h diff --git a/libtransport/src/hicn/transport/interfaces/publication_options.h b/libtransport/src/hicn/transport/interfaces/publication_options.h index ae5366ce7..ae5366ce7 100755..100644 --- a/libtransport/src/hicn/transport/interfaces/publication_options.h +++ b/libtransport/src/hicn/transport/interfaces/publication_options.h diff --git a/libtransport/src/hicn/transport/interfaces/rtc_socket_consumer.cc b/libtransport/src/hicn/transport/interfaces/rtc_socket_consumer.cc index cc4f478af..ef952a891 100755..100644 --- a/libtransport/src/hicn/transport/interfaces/rtc_socket_consumer.cc +++ b/libtransport/src/hicn/transport/interfaces/rtc_socket_consumer.cc @@ -22,8 +22,7 @@ namespace interface { RTCConsumerSocket::RTCConsumerSocket(int protocol, asio::io_service &io_service) : ConsumerSocket(protocol, io_service) {} -RTCConsumerSocket::RTCConsumerSocket(int protocol) - : ConsumerSocket(protocol) {} +RTCConsumerSocket::RTCConsumerSocket(int protocol) : ConsumerSocket(protocol) {} RTCConsumerSocket::~RTCConsumerSocket() {} diff --git a/libtransport/src/hicn/transport/interfaces/rtc_socket_consumer.h b/libtransport/src/hicn/transport/interfaces/rtc_socket_consumer.h index cfde3128d..cfde3128d 100755..100644 --- a/libtransport/src/hicn/transport/interfaces/rtc_socket_consumer.h +++ b/libtransport/src/hicn/transport/interfaces/rtc_socket_consumer.h diff --git a/libtransport/src/hicn/transport/interfaces/rtc_socket_producer.cc b/libtransport/src/hicn/transport/interfaces/rtc_socket_producer.cc index f19502dee..84c80dad7 100644 --- a/libtransport/src/hicn/transport/interfaces/rtc_socket_producer.cc +++ b/libtransport/src/hicn/transport/interfaces/rtc_socket_producer.cc @@ -72,7 +72,6 @@ RTCProducerSocket::RTCProducerSocket() prodLabel_ = ((rand() % 255) << 24UL); } - RTCProducerSocket::~RTCProducerSocket() {} void RTCProducerSocket::registerName(Prefix &producer_namespace) { diff --git a/libtransport/src/hicn/transport/interfaces/rtc_socket_producer.h b/libtransport/src/hicn/transport/interfaces/rtc_socket_producer.h index f1bcaa9e8..f1bcaa9e8 100755..100644 --- a/libtransport/src/hicn/transport/interfaces/rtc_socket_producer.h +++ b/libtransport/src/hicn/transport/interfaces/rtc_socket_producer.h diff --git a/libtransport/src/hicn/transport/interfaces/socket.h b/libtransport/src/hicn/transport/interfaces/socket.h index 22757810a..22757810a 100755..100644 --- a/libtransport/src/hicn/transport/interfaces/socket.h +++ b/libtransport/src/hicn/transport/interfaces/socket.h diff --git a/libtransport/src/hicn/transport/interfaces/socket_consumer.h b/libtransport/src/hicn/transport/interfaces/socket_consumer.h index 536d2fde3..536d2fde3 100755..100644 --- a/libtransport/src/hicn/transport/interfaces/socket_consumer.h +++ b/libtransport/src/hicn/transport/interfaces/socket_consumer.h diff --git a/libtransport/src/hicn/transport/interfaces/socket_options_default_values.h b/libtransport/src/hicn/transport/interfaces/socket_options_default_values.h index 5fae1c484..5fae1c484 100755..100644 --- a/libtransport/src/hicn/transport/interfaces/socket_options_default_values.h +++ b/libtransport/src/hicn/transport/interfaces/socket_options_default_values.h diff --git a/libtransport/src/hicn/transport/interfaces/socket_options_keys.h b/libtransport/src/hicn/transport/interfaces/socket_options_keys.h index 1afad2b48..1afad2b48 100755..100644 --- a/libtransport/src/hicn/transport/interfaces/socket_options_keys.h +++ b/libtransport/src/hicn/transport/interfaces/socket_options_keys.h diff --git a/libtransport/src/hicn/transport/interfaces/socket_producer.cc b/libtransport/src/hicn/transport/interfaces/socket_producer.cc index d9204f111..5bd522faf 100755..100644 --- a/libtransport/src/hicn/transport/interfaces/socket_producer.cc +++ b/libtransport/src/hicn/transport/interfaces/socket_producer.cc @@ -54,7 +54,6 @@ ProducerSocket::ProducerSocket(asio::io_service &io_service) } ProducerSocket::~ProducerSocket() { - processing_thread_stop_ = true; portal_->stopEventsLoop(true); @@ -78,9 +77,7 @@ void ProducerSocket::serveForever() { } } -void ProducerSocket::stop() { - portal_->stopEventsLoop(); -} +void ProducerSocket::stop() { portal_->stopEventsLoop(); } void ProducerSocket::registerPrefix(const Prefix &producer_namespace) { served_namespaces_.push_back(producer_namespace); diff --git a/libtransport/src/hicn/transport/interfaces/socket_producer.h b/libtransport/src/hicn/transport/interfaces/socket_producer.h index 06c47d973..06c47d973 100755..100644 --- a/libtransport/src/hicn/transport/interfaces/socket_producer.h +++ b/libtransport/src/hicn/transport/interfaces/socket_producer.h diff --git a/libtransport/src/hicn/transport/portability/CMakeLists.txt b/libtransport/src/hicn/transport/portability/CMakeLists.txt index eee973c2d..5ad3c8207 100755..100644 --- a/libtransport/src/hicn/transport/portability/CMakeLists.txt +++ b/libtransport/src/hicn/transport/portability/CMakeLists.txt @@ -22,5 +22,11 @@ list(APPEND SOURCE_FILES "" ) +if(WIN32) + list(APPEND HEADER_FILES + ${CMAKE_CURRENT_SOURCE_DIR}/win_portability.h + ) +endif() + set(SOURCE_FILES ${SOURCE_FILES} PARENT_SCOPE) set(HEADER_FILES ${HEADER_FILES} PARENT_SCOPE)
\ No newline at end of file diff --git a/libtransport/src/hicn/transport/portability/c_portability.h b/libtransport/src/hicn/transport/portability/c_portability.h index 71e976a81..71e976a81 100755..100644 --- a/libtransport/src/hicn/transport/portability/c_portability.h +++ b/libtransport/src/hicn/transport/portability/c_portability.h diff --git a/libtransport/src/hicn/transport/portability/portability.h b/libtransport/src/hicn/transport/portability/portability.h index 7063e1822..1d97a346e 100755..100644 --- a/libtransport/src/hicn/transport/portability/portability.h +++ b/libtransport/src/hicn/transport/portability/portability.h @@ -17,6 +17,10 @@ #pragma once +#ifdef _WIN32 +#include <hicn/transport/portability/win_portability.h> +#endif + #include <hicn/transport/portability/c_portability.h> #include <string.h> diff --git a/libtransport/src/hicn/transport/portability/win_portability.h b/libtransport/src/hicn/transport/portability/win_portability.h new file mode 100644 index 000000000..f1d6e2b0e --- /dev/null +++ b/libtransport/src/hicn/transport/portability/win_portability.h @@ -0,0 +1,38 @@ +/*
+ * Copyright (c) 2017-2019 Cisco and/or its affiliates.
+ * Copyright 2017 Facebook, Inc.
+ *
+ * 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.
+ */
+
+#pragma once
+#define WIN32_LEAN_AND_MEAN
+#define NOMINMAX
+#include <parc/windows/parc_Utils.h>
+#include <stdint.h>
+#include <stdio.h>
+#include <string.h>
+#include <time.h>
+#include <windows.h>
+#include <winsock2.h>
+#include <ws2ipdef.h>
+#include <ws2tcpip.h>
+#include <algorithm>
+
+#define __ORDER_LITTLE_ENDIAN__ 0x41424344UL
+#define __ORDER_BIG_ENDIAN__ 0x44434241UL
+#define __BYTE_ORDER__ ('ABCD')
+#undef DELETE
+
+#define HAVE_STRUCT_TIMESPEC
+#include <pthread.h>
\ No newline at end of file diff --git a/libtransport/src/hicn/transport/protocols/CMakeLists.txt b/libtransport/src/hicn/transport/protocols/CMakeLists.txt index 1c3b76c24..1c3b76c24 100755..100644 --- a/libtransport/src/hicn/transport/protocols/CMakeLists.txt +++ b/libtransport/src/hicn/transport/protocols/CMakeLists.txt diff --git a/libtransport/src/hicn/transport/protocols/cbr.cc b/libtransport/src/hicn/transport/protocols/cbr.cc index 3da4819c3..3da4819c3 100755..100644 --- a/libtransport/src/hicn/transport/protocols/cbr.cc +++ b/libtransport/src/hicn/transport/protocols/cbr.cc diff --git a/libtransport/src/hicn/transport/protocols/cbr.h b/libtransport/src/hicn/transport/protocols/cbr.h index 0a572292a..0a572292a 100755..100644 --- a/libtransport/src/hicn/transport/protocols/cbr.h +++ b/libtransport/src/hicn/transport/protocols/cbr.h diff --git a/libtransport/src/hicn/transport/protocols/consumer.conf b/libtransport/src/hicn/transport/protocols/consumer.conf index 1a366f32f..1a366f32f 100755..100644 --- a/libtransport/src/hicn/transport/protocols/consumer.conf +++ b/libtransport/src/hicn/transport/protocols/consumer.conf diff --git a/libtransport/src/hicn/transport/protocols/download_observer.h b/libtransport/src/hicn/transport/protocols/download_observer.h index 6d24fe6fd..6d24fe6fd 100755..100644 --- a/libtransport/src/hicn/transport/protocols/download_observer.h +++ b/libtransport/src/hicn/transport/protocols/download_observer.h diff --git a/libtransport/src/hicn/transport/protocols/protocol.cc b/libtransport/src/hicn/transport/protocols/protocol.cc index ea4fd6dbf..ea4fd6dbf 100755..100644 --- a/libtransport/src/hicn/transport/protocols/protocol.cc +++ b/libtransport/src/hicn/transport/protocols/protocol.cc diff --git a/libtransport/src/hicn/transport/protocols/protocol.h b/libtransport/src/hicn/transport/protocols/protocol.h index 56c57e025..56c57e025 100755..100644 --- a/libtransport/src/hicn/transport/protocols/protocol.h +++ b/libtransport/src/hicn/transport/protocols/protocol.h diff --git a/libtransport/src/hicn/transport/protocols/raaqm.cc b/libtransport/src/hicn/transport/protocols/raaqm.cc index cd22ecfdc..cd22ecfdc 100755..100644 --- a/libtransport/src/hicn/transport/protocols/raaqm.cc +++ b/libtransport/src/hicn/transport/protocols/raaqm.cc diff --git a/libtransport/src/hicn/transport/protocols/raaqm.h b/libtransport/src/hicn/transport/protocols/raaqm.h index 6ca410251..6ca410251 100755..100644 --- a/libtransport/src/hicn/transport/protocols/raaqm.h +++ b/libtransport/src/hicn/transport/protocols/raaqm.h diff --git a/libtransport/src/hicn/transport/protocols/raaqm_data_path.cc b/libtransport/src/hicn/transport/protocols/raaqm_data_path.cc index f876cf4f8..2e7aa531a 100755..100644 --- a/libtransport/src/hicn/transport/protocols/raaqm_data_path.cc +++ b/libtransport/src/hicn/transport/protocols/raaqm_data_path.cc @@ -42,10 +42,9 @@ RaaqmDataPath::RaaqmDataPath(double drop_factor, raw_data_bytes_received_(0), last_raw_data_bytes_received_(0), rtt_samples_(samples_), + last_received_pkt_(std::chrono::steady_clock::now()), average_rtt_(0), - alpha_(ALPHA) { - gettimeofday(&m_last_received_pkt_, 0); -} + alpha_(ALPHA) {} RaaqmDataPath &RaaqmDataPath::insertNewRtt(uint64_t new_rtt) { rtt_ = new_rtt; @@ -59,7 +58,7 @@ RaaqmDataPath &RaaqmDataPath::insertNewRtt(uint64_t new_rtt) { prop_delay_ = rtt_min_; } - gettimeofday(&m_last_received_pkt_, 0); + last_received_pkt_ = std::chrono::steady_clock::now(); return *this; } @@ -144,9 +143,9 @@ bool RaaqmDataPath::newPropagationDelayAvailable() { unsigned int RaaqmDataPath::getPropagationDelay() { return prop_delay_; } bool RaaqmDataPath::isStale() { - struct timeval now; - gettimeofday(&now, 0); - double time = getMicroSeconds(now) - getMicroSeconds(m_last_received_pkt_); + TimePoint now = std::chrono::steady_clock::now(); + auto time = std::chrono::duration_cast<Microseconds>(now - last_received_pkt_) + .count(); if (time > 2000000) { return true; } diff --git a/libtransport/src/hicn/transport/protocols/raaqm_data_path.h b/libtransport/src/hicn/transport/protocols/raaqm_data_path.h index 6f63940c9..a0b9ec9ca 100755..100644 --- a/libtransport/src/hicn/transport/protocols/raaqm_data_path.h +++ b/libtransport/src/hicn/transport/protocols/raaqm_data_path.h @@ -17,7 +17,7 @@ #include <hicn/transport/utils/min_filter.h> -#include <sys/time.h> +#include <chrono> #include <climits> #include <iostream> @@ -30,6 +30,9 @@ namespace transport { namespace protocol { class RaaqmDataPath { + using TimePoint = std::chrono::steady_clock::time_point; + using Microseconds = std::chrono::microseconds; + public: RaaqmDataPath(double drop_factor, double minimum_drop_probability, unsigned new_timer, unsigned int samples, @@ -219,7 +222,7 @@ class RaaqmDataPath { /** * Time of the last call to the path reporter method */ - struct timeval m_last_received_pkt_; + TimePoint last_received_pkt_; double average_rtt_; double alpha_; diff --git a/libtransport/src/hicn/transport/protocols/rate_estimation.cc b/libtransport/src/hicn/transport/protocols/rate_estimation.cc index e313bf9f6..b603ec200 100755..100644 --- a/libtransport/src/hicn/transport/protocols/rate_estimation.cc +++ b/libtransport/src/hicn/transport/protocols/rate_estimation.cc @@ -16,6 +16,8 @@ #include <hicn/transport/protocols/rate_estimation.h> #include <hicn/transport/utils/log.h> +#include <thread> + namespace transport { namespace protocol { @@ -31,7 +33,8 @@ void *Timer(void *data) { pthread_mutex_unlock(&(estimator->mutex_)); while (estimator->is_running_) { - usleep(KV * dat_rtt); + std::this_thread::sleep_for( + std::chrono::microseconds((uint64_t)(KV * dat_rtt))); pthread_mutex_lock(&(estimator->mutex_)); @@ -88,8 +91,8 @@ InterRttEstimator::InterRttEstimator(double alpha_arg) { this->win_current_ = 1.0; pthread_mutex_init(&(this->mutex_), NULL); - gettimeofday(&(this->start_time_), 0); - gettimeofday(&(this->begin_batch_), 0); + this->start_time_ = std::chrono::steady_clock::now(); + this->begin_batch_ = std::chrono::steady_clock::now(); } InterRttEstimator::~InterRttEstimator() { @@ -124,10 +127,10 @@ void InterRttEstimator::onRttUpdate(double rtt) { } void InterRttEstimator::onWindowIncrease(double win_current) { - timeval end; - gettimeofday(&end, 0); - double delay = RaaqmDataPath::getMicroSeconds(end) - - RaaqmDataPath::getMicroSeconds(this->begin_batch_); + TimePoint end = std::chrono::steady_clock::now(); + auto delay = + std::chrono::duration_cast<Microseconds>(end - this->begin_batch_) + .count(); pthread_mutex_lock(&(this->mutex_)); this->avg_win_ += this->win_current_ * delay; @@ -135,14 +138,14 @@ void InterRttEstimator::onWindowIncrease(double win_current) { this->win_change_ += delay; pthread_mutex_unlock(&(this->mutex_)); - gettimeofday(&(this->begin_batch_), 0); + this->begin_batch_ = std::chrono::steady_clock::now(); } void InterRttEstimator::onWindowDecrease(double win_current) { - timeval end; - gettimeofday(&end, 0); - double delay = RaaqmDataPath::getMicroSeconds(end) - - RaaqmDataPath::getMicroSeconds(this->begin_batch_); + TimePoint end = std::chrono::steady_clock::now(); + auto delay = + std::chrono::duration_cast<Microseconds>(end - this->begin_batch_) + .count(); pthread_mutex_lock(&(this->mutex_)); this->avg_win_ += this->win_current_ * delay; @@ -150,26 +153,25 @@ void InterRttEstimator::onWindowDecrease(double win_current) { this->win_change_ += delay; pthread_mutex_unlock(&(this->mutex_)); - gettimeofday(&(this->begin_batch_), 0); + this->begin_batch_ = std::chrono::steady_clock::now(); } ALaTcpEstimator::ALaTcpEstimator() { this->estimation_ = 0.0; this->observer_ = NULL; - gettimeofday(&(this->start_time_), 0); + this->start_time_ = std::chrono::steady_clock::now(); this->totalSize_ = 0.0; } void ALaTcpEstimator::onStart() { this->totalSize_ = 0.0; - gettimeofday(&(this->start_time_), 0); + this->start_time_ = std::chrono::steady_clock::now(); } void ALaTcpEstimator::onDownloadFinished() { - timeval end; - gettimeofday(&end, 0); - double delay = RaaqmDataPath::getMicroSeconds(end) - - RaaqmDataPath::getMicroSeconds(this->start_time_); + TimePoint end = std::chrono::steady_clock::now(); + auto delay = + std::chrono::duration_cast<Microseconds>(end - this->start_time_).count(); this->estimation_ = this->totalSize_ * 8 * 1000000 / delay; if (observer_) { observer_->notifyStats(this->estimation_); @@ -189,23 +191,22 @@ SimpleEstimator::SimpleEstimator(double alphaArg, int batching_param) { this->number_of_packets_ = 0; this->base_alpha_ = alphaArg; this->alpha_ = alphaArg; - gettimeofday(&(this->start_time_), 0); - gettimeofday(&(this->begin_batch_), 0); + this->start_time_ = std::chrono::steady_clock::now(); + this->begin_batch_ = std::chrono::steady_clock::now(); } void SimpleEstimator::onStart() { this->estimated_ = false; this->number_of_packets_ = 0; this->total_size_ = 0.0; - gettimeofday(&(this->begin_batch_), 0); - gettimeofday(&(this->start_time_), 0); + this->start_time_ = std::chrono::steady_clock::now(); + this->begin_batch_ = std::chrono::steady_clock::now(); } void SimpleEstimator::onDownloadFinished() { - timeval end; - gettimeofday(&end, 0); - double delay = RaaqmDataPath::getMicroSeconds(end) - - RaaqmDataPath::getMicroSeconds(this->start_time_); + TimePoint end = std::chrono::steady_clock::now(); + auto delay = + std::chrono::duration_cast<Microseconds>(end - this->start_time_).count(); if (observer_) { observer_->notifyDownloadTime(delay); } @@ -227,8 +228,8 @@ void SimpleEstimator::onDownloadFinished() { } else { if (this->number_of_packets_ >= (int)(75.0 * (double)this->batching_param_ / 100.0)) { - delay = RaaqmDataPath::getMicroSeconds(end) - - RaaqmDataPath::getMicroSeconds(this->begin_batch_); + delay = std::chrono::duration_cast<Microseconds>(end - this->begin_batch_) + .count(); // Assuming all packets carry max_packet_size_ bytes of data // (8*max_packet_size_ bits); 1000000 factor to convert us to seconds if (this->estimation_) { @@ -247,8 +248,8 @@ void SimpleEstimator::onDownloadFinished() { } this->number_of_packets_ = 0; this->total_size_ = 0.0; - gettimeofday(&(this->begin_batch_), 0); - gettimeofday(&(this->start_time_), 0); + this->start_time_ = std::chrono::steady_clock::now(); + this->begin_batch_ = std::chrono::steady_clock::now(); } void SimpleEstimator::onDataReceived(int packet_size) { @@ -259,10 +260,10 @@ void SimpleEstimator::onRttUpdate(double rtt) { this->number_of_packets_++; if (number_of_packets_ == this->batching_param_) { - timeval end; - gettimeofday(&end, 0); - double delay = RaaqmDataPath::getMicroSeconds(end) - - RaaqmDataPath::getMicroSeconds(this->begin_batch_); + TimePoint end = std::chrono::steady_clock::now(); + auto delay = + std::chrono::duration_cast<Microseconds>(end - this->begin_batch_) + .count(); // Assuming all packets carry max_packet_size_ bytes of data // (8*max_packet_size_ bits); 1000000 factor to convert us to seconds if (this->estimation_) { @@ -278,7 +279,7 @@ void SimpleEstimator::onRttUpdate(double rtt) { this->alpha_ = this->base_alpha_; this->number_of_packets_ = 0; this->total_size_ = 0.0; - gettimeofday(&(this->begin_batch_), 0); + this->begin_batch_ = std::chrono::steady_clock::now(); } } @@ -295,8 +296,8 @@ BatchingPacketsEstimator::BatchingPacketsEstimator(double alpha_arg, this->max_packet_size_ = 0; this->estimation_ = 0.0; this->win_current_ = 1.0; - gettimeofday(&(this->begin_batch_), 0); - gettimeofday(&(this->start_time_), 0); + this->begin_batch_ = std::chrono::steady_clock::now(); + this->start_time_ = std::chrono::steady_clock::now(); } void BatchingPacketsEstimator::onRttUpdate(double rtt) { @@ -327,25 +328,25 @@ void BatchingPacketsEstimator::onRttUpdate(double rtt) { } void BatchingPacketsEstimator::onWindowIncrease(double win_current) { - timeval end; - gettimeofday(&end, 0); - double delay = RaaqmDataPath::getMicroSeconds(end) - - RaaqmDataPath::getMicroSeconds(this->begin_batch_); + TimePoint end = std::chrono::steady_clock::now(); + auto delay = + std::chrono::duration_cast<Microseconds>(end - this->begin_batch_) + .count(); this->avg_win_ += this->win_current_ * delay; this->win_current_ = win_current; this->win_change_ += delay; - gettimeofday(&(this->begin_batch_), 0); + this->begin_batch_ = std::chrono::steady_clock::now(); } void BatchingPacketsEstimator::onWindowDecrease(double win_current) { - timeval end; - gettimeofday(&end, 0); - double delay = RaaqmDataPath::getMicroSeconds(end) - - RaaqmDataPath::getMicroSeconds(this->begin_batch_); + TimePoint end = std::chrono::steady_clock::now(); + auto delay = + std::chrono::duration_cast<Microseconds>(end - this->begin_batch_) + .count(); this->avg_win_ += this->win_current_ * delay; this->win_current_ = win_current; this->win_change_ += delay; - gettimeofday(&(this->begin_batch_), 0); + this->begin_batch_ = std::chrono::steady_clock::now(); } } // end namespace protocol diff --git a/libtransport/src/hicn/transport/protocols/rate_estimation.h b/libtransport/src/hicn/transport/protocols/rate_estimation.h index b889efe12..91964ec1d 100755..100644 --- a/libtransport/src/hicn/transport/protocols/rate_estimation.h +++ b/libtransport/src/hicn/transport/protocols/rate_estimation.h @@ -15,11 +15,11 @@ #pragma once -#include <unistd.h> - #include <hicn/transport/protocols/download_observer.h> #include <hicn/transport/protocols/raaqm_data_path.h> +#include <chrono> + #define BATCH 50 #define KV 20 #define ALPHA 0.8 @@ -31,6 +31,9 @@ namespace protocol { class IcnRateEstimator { public: + using TimePoint = std::chrono::steady_clock::time_point; + using Microseconds = std::chrono::microseconds; + IcnRateEstimator(){}; virtual ~IcnRateEstimator(){}; @@ -51,8 +54,8 @@ class IcnRateEstimator { this->observer_ = observer; }; IcnObserver *observer_; - struct timeval start_time_; - struct timeval begin_batch_; + TimePoint start_time_; + TimePoint begin_batch_; double base_alpha_; double alpha_; double estimation_; diff --git a/libtransport/src/hicn/transport/protocols/rtc.h b/libtransport/src/hicn/transport/protocols/rtc.h index 249af6b99..249af6b99 100755..100644 --- a/libtransport/src/hicn/transport/protocols/rtc.h +++ b/libtransport/src/hicn/transport/protocols/rtc.h diff --git a/libtransport/src/hicn/transport/protocols/rtc_data_path.cc b/libtransport/src/hicn/transport/protocols/rtc_data_path.cc index 6c9605fb2..6c9605fb2 100755..100644 --- a/libtransport/src/hicn/transport/protocols/rtc_data_path.cc +++ b/libtransport/src/hicn/transport/protocols/rtc_data_path.cc diff --git a/libtransport/src/hicn/transport/protocols/test/CMakeLists.txt b/libtransport/src/hicn/transport/protocols/test/CMakeLists.txt index 6f9fdb9aa..6f9fdb9aa 100755..100644 --- a/libtransport/src/hicn/transport/protocols/test/CMakeLists.txt +++ b/libtransport/src/hicn/transport/protocols/test/CMakeLists.txt diff --git a/libtransport/src/hicn/transport/protocols/test/test_transport_producer.cc b/libtransport/src/hicn/transport/protocols/test/test_transport_producer.cc index 204f2cbe2..204f2cbe2 100755..100644 --- a/libtransport/src/hicn/transport/protocols/test/test_transport_producer.cc +++ b/libtransport/src/hicn/transport/protocols/test/test_transport_producer.cc diff --git a/libtransport/src/hicn/transport/protocols/vegas.h b/libtransport/src/hicn/transport/protocols/vegas.h index 7791ffc94..7791ffc94 100755..100644 --- a/libtransport/src/hicn/transport/protocols/vegas.h +++ b/libtransport/src/hicn/transport/protocols/vegas.h diff --git a/libtransport/src/hicn/transport/protocols/vegas_rto_estimator.cc b/libtransport/src/hicn/transport/protocols/vegas_rto_estimator.cc index f5f797bbe..f5f797bbe 100755..100644 --- a/libtransport/src/hicn/transport/protocols/vegas_rto_estimator.cc +++ b/libtransport/src/hicn/transport/protocols/vegas_rto_estimator.cc diff --git a/libtransport/src/hicn/transport/protocols/vegas_rto_estimator.h b/libtransport/src/hicn/transport/protocols/vegas_rto_estimator.h index e84afc49c..e84afc49c 100755..100644 --- a/libtransport/src/hicn/transport/protocols/vegas_rto_estimator.h +++ b/libtransport/src/hicn/transport/protocols/vegas_rto_estimator.h diff --git a/libtransport/src/hicn/transport/utils/CMakeLists.txt b/libtransport/src/hicn/transport/utils/CMakeLists.txt index 088fb5862..088fb5862 100755..100644 --- a/libtransport/src/hicn/transport/utils/CMakeLists.txt +++ b/libtransport/src/hicn/transport/utils/CMakeLists.txt diff --git a/libtransport/src/hicn/transport/utils/array.h b/libtransport/src/hicn/transport/utils/array.h index a3a66e498..a3a66e498 100755..100644 --- a/libtransport/src/hicn/transport/utils/array.h +++ b/libtransport/src/hicn/transport/utils/array.h diff --git a/libtransport/src/hicn/transport/utils/branch_prediction.h b/libtransport/src/hicn/transport/utils/branch_prediction.h index b12282fe8..8cbfaca76 100755..100644 --- a/libtransport/src/hicn/transport/utils/branch_prediction.h +++ b/libtransport/src/hicn/transport/utils/branch_prediction.h @@ -18,5 +18,10 @@ #undef TRANSPORT_EXPECT_TRUE #undef TRANSPORT_EXPECT_FALSE +#ifndef _WIN32 #define TRANSPORT_EXPECT_TRUE(x) __builtin_expect((x), 1) -#define TRANSPORT_EXPECT_FALSE(x) __builtin_expect((x), 0)
\ No newline at end of file +#define TRANSPORT_EXPECT_FALSE(x) __builtin_expect((x), 0) +#else +#define TRANSPORT_EXPECT_TRUE(x) (x) +#define TRANSPORT_EXPECT_FALSE(x) (x) +#endif
\ No newline at end of file diff --git a/libtransport/src/hicn/transport/utils/content_store.cc b/libtransport/src/hicn/transport/utils/content_store.cc index 4c7637dad..4c7637dad 100755..100644 --- a/libtransport/src/hicn/transport/utils/content_store.cc +++ b/libtransport/src/hicn/transport/utils/content_store.cc diff --git a/libtransport/src/hicn/transport/utils/content_store.h b/libtransport/src/hicn/transport/utils/content_store.h index ab4963fff..ab4963fff 100755..100644 --- a/libtransport/src/hicn/transport/utils/content_store.h +++ b/libtransport/src/hicn/transport/utils/content_store.h diff --git a/libtransport/src/hicn/transport/utils/conversions.h b/libtransport/src/hicn/transport/utils/conversions.h index 24b529206..24b529206 100755..100644 --- a/libtransport/src/hicn/transport/utils/conversions.h +++ b/libtransport/src/hicn/transport/utils/conversions.h diff --git a/libtransport/src/hicn/transport/utils/crypto_hash.h b/libtransport/src/hicn/transport/utils/crypto_hash.h index 0c15c8bda..0c15c8bda 100755..100644 --- a/libtransport/src/hicn/transport/utils/crypto_hash.h +++ b/libtransport/src/hicn/transport/utils/crypto_hash.h diff --git a/libtransport/src/hicn/transport/utils/crypto_hash_type.h b/libtransport/src/hicn/transport/utils/crypto_hash_type.h index b7597e208..b7597e208 100755..100644 --- a/libtransport/src/hicn/transport/utils/crypto_hash_type.h +++ b/libtransport/src/hicn/transport/utils/crypto_hash_type.h diff --git a/libtransport/src/hicn/transport/utils/crypto_hasher.h b/libtransport/src/hicn/transport/utils/crypto_hasher.h index c34a26fac..c34a26fac 100755..100644 --- a/libtransport/src/hicn/transport/utils/crypto_hasher.h +++ b/libtransport/src/hicn/transport/utils/crypto_hasher.h diff --git a/libtransport/src/hicn/transport/utils/crypto_suite.h b/libtransport/src/hicn/transport/utils/crypto_suite.h index 8ae32b846..8ae32b846 100755..100644 --- a/libtransport/src/hicn/transport/utils/crypto_suite.h +++ b/libtransport/src/hicn/transport/utils/crypto_suite.h diff --git a/libtransport/src/hicn/transport/utils/daemonizator.cc b/libtransport/src/hicn/transport/utils/daemonizator.cc index d9b3109af..d9b3109af 100755..100644 --- a/libtransport/src/hicn/transport/utils/daemonizator.cc +++ b/libtransport/src/hicn/transport/utils/daemonizator.cc diff --git a/libtransport/src/hicn/transport/utils/daemonizator.h b/libtransport/src/hicn/transport/utils/daemonizator.h index a21ce8a7b..a21ce8a7b 100755..100644 --- a/libtransport/src/hicn/transport/utils/daemonizator.h +++ b/libtransport/src/hicn/transport/utils/daemonizator.h diff --git a/libtransport/src/hicn/transport/utils/deadline_timer.h b/libtransport/src/hicn/transport/utils/deadline_timer.h index 61f906141..61f906141 100755..100644 --- a/libtransport/src/hicn/transport/utils/deadline_timer.h +++ b/libtransport/src/hicn/transport/utils/deadline_timer.h diff --git a/libtransport/src/hicn/transport/utils/endianess.h b/libtransport/src/hicn/transport/utils/endianess.h index a3ec21c90..d86e764ab 100755..100644 --- a/libtransport/src/hicn/transport/utils/endianess.h +++ b/libtransport/src/hicn/transport/utils/endianess.h @@ -17,7 +17,12 @@ #include <hicn/transport/portability/portability.h> +#ifndef _WIN32 #include <arpa/inet.h> +#else +#include <hicn/transport/portability/win_portability.h> +#endif + #include <cstring> namespace utils { diff --git a/libtransport/src/hicn/transport/utils/epoll_event_reactor.cc b/libtransport/src/hicn/transport/utils/epoll_event_reactor.cc index 81b471857..81b471857 100755..100644 --- a/libtransport/src/hicn/transport/utils/epoll_event_reactor.cc +++ b/libtransport/src/hicn/transport/utils/epoll_event_reactor.cc diff --git a/libtransport/src/hicn/transport/utils/epoll_event_reactor.h b/libtransport/src/hicn/transport/utils/epoll_event_reactor.h index bb4db3ee7..bb4db3ee7 100755..100644 --- a/libtransport/src/hicn/transport/utils/epoll_event_reactor.h +++ b/libtransport/src/hicn/transport/utils/epoll_event_reactor.h diff --git a/libtransport/src/hicn/transport/utils/event_reactor.h b/libtransport/src/hicn/transport/utils/event_reactor.h index 4f8b58296..4f8b58296 100755..100644 --- a/libtransport/src/hicn/transport/utils/event_reactor.h +++ b/libtransport/src/hicn/transport/utils/event_reactor.h diff --git a/libtransport/src/hicn/transport/utils/event_thread.h b/libtransport/src/hicn/transport/utils/event_thread.h index 3bf08c94b..3bf08c94b 100755..100644 --- a/libtransport/src/hicn/transport/utils/event_thread.h +++ b/libtransport/src/hicn/transport/utils/event_thread.h diff --git a/libtransport/src/hicn/transport/utils/fd_deadline_timer.h b/libtransport/src/hicn/transport/utils/fd_deadline_timer.h index 3ed4590bc..3ed4590bc 100755..100644 --- a/libtransport/src/hicn/transport/utils/fd_deadline_timer.h +++ b/libtransport/src/hicn/transport/utils/fd_deadline_timer.h diff --git a/libtransport/src/hicn/transport/utils/hash.h b/libtransport/src/hicn/transport/utils/hash.h index 6815ca4bf..6815ca4bf 100755..100644 --- a/libtransport/src/hicn/transport/utils/hash.h +++ b/libtransport/src/hicn/transport/utils/hash.h diff --git a/libtransport/src/hicn/transport/utils/identity.h b/libtransport/src/hicn/transport/utils/identity.h index 018842ee3..018842ee3 100755..100644 --- a/libtransport/src/hicn/transport/utils/identity.h +++ b/libtransport/src/hicn/transport/utils/identity.h diff --git a/libtransport/src/hicn/transport/utils/key_id.h b/libtransport/src/hicn/transport/utils/key_id.h index d67b73d7a..d67b73d7a 100755..100644 --- a/libtransport/src/hicn/transport/utils/key_id.h +++ b/libtransport/src/hicn/transport/utils/key_id.h diff --git a/libtransport/src/hicn/transport/utils/linux.h b/libtransport/src/hicn/transport/utils/linux.h index 5820528e1..5820528e1 100755..100644 --- a/libtransport/src/hicn/transport/utils/linux.h +++ b/libtransport/src/hicn/transport/utils/linux.h diff --git a/libtransport/src/hicn/transport/utils/literals.h b/libtransport/src/hicn/transport/utils/literals.h index bd00e0a58..bd00e0a58 100755..100644 --- a/libtransport/src/hicn/transport/utils/literals.h +++ b/libtransport/src/hicn/transport/utils/literals.h diff --git a/libtransport/src/hicn/transport/utils/membuf.cc b/libtransport/src/hicn/transport/utils/membuf.cc index 0ab1a6044..e75e85b35 100755..100644 --- a/libtransport/src/hicn/transport/utils/membuf.cc +++ b/libtransport/src/hicn/transport/utils/membuf.cc @@ -18,6 +18,9 @@ * The code in this file if adapated from the IOBuf of folly: * https://github.com/facebook/folly/blob/master/folly/io/IOBuf.h */ +#ifdef _WIN32 +#include <hicn/transport/portability/win_portability.h> +#endif #include <hicn/transport/utils/membuf.h> diff --git a/libtransport/src/hicn/transport/utils/membuf.h b/libtransport/src/hicn/transport/utils/membuf.h index 944237e2b..5a10d4182 100755..100644 --- a/libtransport/src/hicn/transport/utils/membuf.h +++ b/libtransport/src/hicn/transport/utils/membuf.h @@ -35,8 +35,9 @@ #include <type_traits> #include <vector> -// Ignore shadowing warnings within this file, so includers can use -Wshadow. +#ifndef _WIN32 TRANSPORT_GNU_DISABLE_WARNING("-Wshadow") +#endif namespace utils { diff --git a/libtransport/src/hicn/transport/utils/min_filter.h b/libtransport/src/hicn/transport/utils/min_filter.h index acb081edc..acb081edc 100755..100644 --- a/libtransport/src/hicn/transport/utils/min_filter.h +++ b/libtransport/src/hicn/transport/utils/min_filter.h diff --git a/libtransport/src/hicn/transport/utils/object_pool.h b/libtransport/src/hicn/transport/utils/object_pool.h index c369f7e12..9fda214cd 100755..100644 --- a/libtransport/src/hicn/transport/utils/object_pool.h +++ b/libtransport/src/hicn/transport/utils/object_pool.h @@ -47,9 +47,7 @@ class ObjectPool { ObjectPool() : destructor_(false) {} - ~ObjectPool() { - destructor_ = true; - } + ~ObjectPool() { destructor_ = true; } std::pair<bool, Ptr> get() { if (object_pool_.empty()) { diff --git a/libtransport/src/hicn/transport/utils/ring_buffer.h b/libtransport/src/hicn/transport/utils/ring_buffer.h index 52bcd81c4..52bcd81c4 100755..100644 --- a/libtransport/src/hicn/transport/utils/ring_buffer.h +++ b/libtransport/src/hicn/transport/utils/ring_buffer.h diff --git a/libtransport/src/hicn/transport/utils/sharable_vector.h b/libtransport/src/hicn/transport/utils/sharable_vector.h index 31adff1ad..31adff1ad 100755..100644 --- a/libtransport/src/hicn/transport/utils/sharable_vector.h +++ b/libtransport/src/hicn/transport/utils/sharable_vector.h diff --git a/libtransport/src/hicn/transport/utils/signer.cc b/libtransport/src/hicn/transport/utils/signer.cc index 579b08aff..005236c2e 100644 --- a/libtransport/src/hicn/transport/utils/signer.cc +++ b/libtransport/src/hicn/transport/utils/signer.cc @@ -22,7 +22,9 @@ #include <hicn/transport/utils/signer.h> extern "C" { +#ifndef _WIN32 TRANSPORT_CLANG_DISABLE_WARNING("-Wextern-c-compat") +#endif #include <hicn/hicn.h> #include <parc/security/parc_PublicKeySigner.h> #include <parc/security/parc_Security.h> diff --git a/libtransport/src/hicn/transport/utils/signer.h b/libtransport/src/hicn/transport/utils/signer.h index 7b54b63c8..7b54b63c8 100755..100644 --- a/libtransport/src/hicn/transport/utils/signer.h +++ b/libtransport/src/hicn/transport/utils/signer.h diff --git a/libtransport/src/hicn/transport/utils/socket.h b/libtransport/src/hicn/transport/utils/socket.h index ab8578f91..ab8578f91 100755..100644 --- a/libtransport/src/hicn/transport/utils/socket.h +++ b/libtransport/src/hicn/transport/utils/socket.h diff --git a/libtransport/src/hicn/transport/utils/spinlock.h b/libtransport/src/hicn/transport/utils/spinlock.h index 33e5cda85..009a94454 100755..100644 --- a/libtransport/src/hicn/transport/utils/spinlock.h +++ b/libtransport/src/hicn/transport/utils/spinlock.h @@ -35,7 +35,7 @@ class SpinLock : private std::atomic_flag { SpinLock& spin_lock_; }; - SpinLock() : std::atomic_flag(false) {} + SpinLock() { clear(); } void lock() { // busy-wait diff --git a/libtransport/src/hicn/transport/utils/stream_buffer.h b/libtransport/src/hicn/transport/utils/stream_buffer.h index adfb696f2..adfb696f2 100755..100644 --- a/libtransport/src/hicn/transport/utils/stream_buffer.h +++ b/libtransport/src/hicn/transport/utils/stream_buffer.h diff --git a/libtransport/src/hicn/transport/utils/string_tokenizer.cc b/libtransport/src/hicn/transport/utils/string_tokenizer.cc index 9d1911080..9d1911080 100755..100644 --- a/libtransport/src/hicn/transport/utils/string_tokenizer.cc +++ b/libtransport/src/hicn/transport/utils/string_tokenizer.cc diff --git a/libtransport/src/hicn/transport/utils/string_tokenizer.h b/libtransport/src/hicn/transport/utils/string_tokenizer.h index 36630eb58..36630eb58 100755..100644 --- a/libtransport/src/hicn/transport/utils/string_tokenizer.h +++ b/libtransport/src/hicn/transport/utils/string_tokenizer.h diff --git a/libtransport/src/hicn/transport/utils/test.h b/libtransport/src/hicn/transport/utils/test.h index e3dd619ac..e3dd619ac 100755..100644 --- a/libtransport/src/hicn/transport/utils/test.h +++ b/libtransport/src/hicn/transport/utils/test.h diff --git a/libtransport/src/hicn/transport/utils/uri.cc b/libtransport/src/hicn/transport/utils/uri.cc index 33eb8b45b..33eb8b45b 100755..100644 --- a/libtransport/src/hicn/transport/utils/uri.cc +++ b/libtransport/src/hicn/transport/utils/uri.cc diff --git a/libtransport/src/hicn/transport/utils/uri.h b/libtransport/src/hicn/transport/utils/uri.h index 7c28e8552..7c28e8552 100755..100644 --- a/libtransport/src/hicn/transport/utils/uri.h +++ b/libtransport/src/hicn/transport/utils/uri.h diff --git a/libtransport/src/hicn/transport/utils/verifier.cc b/libtransport/src/hicn/transport/utils/verifier.cc index 93efe063a..49cbe3b36 100644 --- a/libtransport/src/hicn/transport/utils/verifier.cc +++ b/libtransport/src/hicn/transport/utils/verifier.cc @@ -21,7 +21,9 @@ #include <hicn/transport/utils/verifier.h> extern "C" { +#ifndef _WIN32 TRANSPORT_CLANG_DISABLE_WARNING("-Wextern-c-compat") +#endif #include <hicn/hicn.h> #include <parc/security/parc_CertificateFactory.h> #include <parc/security/parc_InMemoryVerifier.h> diff --git a/libtransport/src/hicn/transport/utils/verifier.h b/libtransport/src/hicn/transport/utils/verifier.h index 6313a7240..6313a7240 100755..100644 --- a/libtransport/src/hicn/transport/utils/verifier.h +++ b/libtransport/src/hicn/transport/utils/verifier.h diff --git a/utils/CMakeLists.txt b/utils/CMakeLists.txt index 9d05942ed..9d05942ed 100755..100644 --- a/utils/CMakeLists.txt +++ b/utils/CMakeLists.txt diff --git a/utils/src/hiperf.cc b/utils/src/hiperf.cc index 221a8746b..221a8746b 100755..100644 --- a/utils/src/hiperf.cc +++ b/utils/src/hiperf.cc diff --git a/utils/src/ping_client.cc b/utils/src/ping_client.cc index 24f7bd7c9..24f7bd7c9 100755..100644 --- a/utils/src/ping_client.cc +++ b/utils/src/ping_client.cc diff --git a/utils/src/ping_server.cc b/utils/src/ping_server.cc index 19de34fec..19de34fec 100755..100644 --- a/utils/src/ping_server.cc +++ b/utils/src/ping_server.cc |