From 20eccdcaf15162f48a372186e15f654d81331f59 Mon Sep 17 00:00:00 2001 From: Mark Giraud Date: Tue, 4 Dec 2018 14:55:46 +0100 Subject: [PATCH] Move plugins to directories for better organisation --- .gitignore | 2 ++ CMakeLists.txt | 19 +++++++++++-------- .../ua_network_pubsub_ethernet.c | 0 .../ua_network_pubsub_ethernet.h | 0 .../{ => networking}/ua_network_pubsub_udp.c | 0 .../{ => networking}/ua_network_pubsub_udp.h | 0 .../ua_securitypolicies.h | 0 .../ua_securitypolicy_basic128rsa15.c | 0 .../ua_securitypolicy_basic256sha256.c | 0 .../ua_securitypolicy_none.c | 0 tests/CMakeLists.txt | 6 +++--- tests/fuzz/CMakeLists.txt | 6 +++--- 12 files changed, 19 insertions(+), 14 deletions(-) rename plugins/{ => networking}/ua_network_pubsub_ethernet.c (100%) rename plugins/{ => networking}/ua_network_pubsub_ethernet.h (100%) rename plugins/{ => networking}/ua_network_pubsub_udp.c (100%) rename plugins/{ => networking}/ua_network_pubsub_udp.h (100%) rename plugins/{ => securityPolicies}/ua_securitypolicies.h (100%) rename plugins/{ => securityPolicies}/ua_securitypolicy_basic128rsa15.c (100%) rename plugins/{ => securityPolicies}/ua_securitypolicy_basic256sha256.c (100%) rename plugins/{ => securityPolicies}/ua_securitypolicy_none.c (100%) diff --git a/.gitignore b/.gitignore index b70498e8c..da46f5afe 100644 --- a/.gitignore +++ b/.gitignore @@ -81,3 +81,5 @@ Makefile /.idea /cmake-build* /tools/certs/certs/* +Pipfile +Pipfile.lock diff --git a/CMakeLists.txt b/CMakeLists.txt index f6bee7af7..f4599c725 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -449,6 +449,8 @@ endif() include_directories(${PROJECT_SOURCE_DIR}/include ${PROJECT_SOURCE_DIR}/plugins + ${PROJECT_SOURCE_DIR}/plugins/networking + ${PROJECT_SOURCE_DIR}/plugins/securityPolicies ${PROJECT_SOURCE_DIR}/deps ${PROJECT_SOURCE_DIR}/src/pubsub ${PROJECT_BINARY_DIR} @@ -578,7 +580,7 @@ set(default_plugin_headers ${PROJECT_SOURCE_DIR}/plugins/ua_accesscontrol_defaul ${PROJECT_SOURCE_DIR}/plugins/ua_log_stdout.h ${PROJECT_SOURCE_DIR}/plugins/ua_nodestore_default.h ${PROJECT_SOURCE_DIR}/plugins/ua_config_default.h - ${PROJECT_SOURCE_DIR}/plugins/ua_securitypolicies.h + ${PROJECT_SOURCE_DIR}/plugins/securityPolicies/ua_securitypolicies.h ) set(default_plugin_sources ${PROJECT_SOURCE_DIR}/plugins/ua_log_stdout.c @@ -587,12 +589,13 @@ set(default_plugin_sources ${PROJECT_SOURCE_DIR}/plugins/ua_log_stdout.c ${PROJECT_SOURCE_DIR}/plugins/ua_pki_certificate.c ${PROJECT_SOURCE_DIR}/plugins/ua_nodestore_default.c ${PROJECT_SOURCE_DIR}/plugins/ua_config_default.c - ${PROJECT_SOURCE_DIR}/plugins/ua_securitypolicy_none.c + ${PROJECT_SOURCE_DIR}/plugins/securityPolicies/ua_securitypolicy_none.c ) if(UA_ENABLE_ENCRYPTION) - list(APPEND default_plugin_sources ${PROJECT_SOURCE_DIR}/plugins/ua_securitypolicy_basic128rsa15.c - ${PROJECT_SOURCE_DIR}/plugins/ua_securitypolicy_basic256sha256.c) + list(APPEND default_plugin_sources + ${PROJECT_SOURCE_DIR}/plugins/securityPolicies/ua_securitypolicy_basic128rsa15.c + ${PROJECT_SOURCE_DIR}/plugins/securityPolicies/ua_securitypolicy_basic256sha256.c) endif() if(UA_ENABLE_DISCOVERY) @@ -601,11 +604,11 @@ if(UA_ENABLE_DISCOVERY) endif() if(UA_ENABLE_PUBSUB) - list(APPEND default_plugin_headers ${PROJECT_SOURCE_DIR}/plugins/ua_network_pubsub_udp.h) - list(APPEND default_plugin_sources ${PROJECT_SOURCE_DIR}/plugins/ua_network_pubsub_udp.c) + list(APPEND default_plugin_headers ${PROJECT_SOURCE_DIR}/plugins/networking/ua_network_pubsub_udp.h) + list(APPEND default_plugin_sources ${PROJECT_SOURCE_DIR}/plugins/networking/ua_network_pubsub_udp.c) if(UA_ENABLE_PUBSUB_ETH_UADP) - list(APPEND default_plugin_headers ${PROJECT_SOURCE_DIR}/plugins/ua_network_pubsub_ethernet.h) - list(APPEND default_plugin_sources ${PROJECT_SOURCE_DIR}/plugins/ua_network_pubsub_ethernet.c) + list(APPEND default_plugin_headers ${PROJECT_SOURCE_DIR}/plugins/networking/ua_network_pubsub_ethernet.h) + list(APPEND default_plugin_sources ${PROJECT_SOURCE_DIR}/plugins/networking/ua_network_pubsub_ethernet.c) endif() endif() diff --git a/plugins/ua_network_pubsub_ethernet.c b/plugins/networking/ua_network_pubsub_ethernet.c similarity index 100% rename from plugins/ua_network_pubsub_ethernet.c rename to plugins/networking/ua_network_pubsub_ethernet.c diff --git a/plugins/ua_network_pubsub_ethernet.h b/plugins/networking/ua_network_pubsub_ethernet.h similarity index 100% rename from plugins/ua_network_pubsub_ethernet.h rename to plugins/networking/ua_network_pubsub_ethernet.h diff --git a/plugins/ua_network_pubsub_udp.c b/plugins/networking/ua_network_pubsub_udp.c similarity index 100% rename from plugins/ua_network_pubsub_udp.c rename to plugins/networking/ua_network_pubsub_udp.c diff --git a/plugins/ua_network_pubsub_udp.h b/plugins/networking/ua_network_pubsub_udp.h similarity index 100% rename from plugins/ua_network_pubsub_udp.h rename to plugins/networking/ua_network_pubsub_udp.h diff --git a/plugins/ua_securitypolicies.h b/plugins/securityPolicies/ua_securitypolicies.h similarity index 100% rename from plugins/ua_securitypolicies.h rename to plugins/securityPolicies/ua_securitypolicies.h diff --git a/plugins/ua_securitypolicy_basic128rsa15.c b/plugins/securityPolicies/ua_securitypolicy_basic128rsa15.c similarity index 100% rename from plugins/ua_securitypolicy_basic128rsa15.c rename to plugins/securityPolicies/ua_securitypolicy_basic128rsa15.c diff --git a/plugins/ua_securitypolicy_basic256sha256.c b/plugins/securityPolicies/ua_securitypolicy_basic256sha256.c similarity index 100% rename from plugins/ua_securitypolicy_basic256sha256.c rename to plugins/securityPolicies/ua_securitypolicy_basic256sha256.c diff --git a/plugins/ua_securitypolicy_none.c b/plugins/securityPolicies/ua_securitypolicy_none.c similarity index 100% rename from plugins/ua_securitypolicy_none.c rename to plugins/securityPolicies/ua_securitypolicy_none.c diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt index 6d09c40df..e8ec60096 100644 --- a/tests/CMakeLists.txt +++ b/tests/CMakeLists.txt @@ -47,16 +47,16 @@ set(test_plugin_sources ${PROJECT_SOURCE_DIR}/arch/ua_network_tcp.c ${PROJECT_SOURCE_DIR}/plugins/historydata/ua_historydatabackend_memory.c ${PROJECT_SOURCE_DIR}/plugins/historydata/ua_historydatagathering_default.c ${PROJECT_SOURCE_DIR}/plugins/historydata/ua_historydatabase_default.c - ${PROJECT_SOURCE_DIR}/plugins/ua_securitypolicy_none.c + ${PROJECT_SOURCE_DIR}/plugins/securityPolicies/ua_securitypolicy_none.c ${PROJECT_SOURCE_DIR}/tests/testing-plugins/testing_policy.c ${PROJECT_SOURCE_DIR}/tests/testing-plugins/testing_networklayers.c ) if(UA_ENABLE_ENCRYPTION) set(test_plugin_sources ${test_plugin_sources} - ${PROJECT_SOURCE_DIR}/plugins/ua_securitypolicy_basic128rsa15.c) + ${PROJECT_SOURCE_DIR}/plugins/securityPolicies/ua_securitypolicy_basic128rsa15.c) set(test_plugin_sources ${test_plugin_sources} - ${PROJECT_SOURCE_DIR}/plugins/ua_securitypolicy_basic256sha256.c) + ${PROJECT_SOURCE_DIR}/plugins/securityPolicies/ua_securitypolicy_basic256sha256.c) endif() add_library(open62541-testplugins OBJECT ${test_plugin_sources} ${PROJECT_SOURCE_DIR}/arch/${UA_ARCHITECTURE}/ua_architecture_functions.c) diff --git a/tests/fuzz/CMakeLists.txt b/tests/fuzz/CMakeLists.txt index 4185f4429..8cb910d8f 100644 --- a/tests/fuzz/CMakeLists.txt +++ b/tests/fuzz/CMakeLists.txt @@ -59,14 +59,14 @@ set(fuzzing_plugin_sources ${PROJECT_SOURCE_DIR}/arch/ua_network_tcp.c ${PROJECT_SOURCE_DIR}/plugins/ua_nodestore_default.c ${PROJECT_SOURCE_DIR}/plugins/ua_accesscontrol_default.c ${PROJECT_SOURCE_DIR}/plugins/ua_pki_certificate.c - ${PROJECT_SOURCE_DIR}/plugins/ua_securitypolicy_none.c + ${PROJECT_SOURCE_DIR}/plugins/securityPolicies/ua_securitypolicy_none.c ) if(UA_ENABLE_ENCRYPTION) set(fuzzing_plugin_sources ${fuzzing_plugin_sources} - ${PROJECT_SOURCE_DIR}/plugins/ua_securitypolicy_basic128rsa15.c) + ${PROJECT_SOURCE_DIR}/plugins/securityPolicies/ua_securitypolicy_basic128rsa15.c) set(fuzzing_plugin_sources ${fuzzing_plugin_sources} - ${PROJECT_SOURCE_DIR}/plugins/ua_securitypolicy_basic256sha256.c) + ${PROJECT_SOURCE_DIR}/plugins/securityPolicies/ua_securitypolicy_basic256sha256.c) endif() add_library(open62541-fuzzplugins OBJECT