github/open62541
7
0
Fork 0
mirror of https://github.com/open62541/open62541.git synced 2025-06-03 04:00:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

Move plugins to directories for better organisation

Browse Source
This commit is contained in:
Mark Giraud 2018-12-04 14:55:46 +01:00 committed by Stefan Profanter
parent 60fb4fc123
commit 20eccdcaf1
12 changed files with 19 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.gitignore vendored
View File

@ -81,3 +81,5 @@ Makefile
/.idea
/cmake-build*
/tools/certs/certs/*
Pipfile
Pipfile.lock

19
CMakeLists.txt
View File

@ -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()

0
plugins/ua_network_pubsub_ethernet.c → plugins/networking/ua_network_pubsub_ethernet.c
View File

0
plugins/ua_network_pubsub_ethernet.h → plugins/networking/ua_network_pubsub_ethernet.h
View File

0
plugins/ua_network_pubsub_udp.c → plugins/networking/ua_network_pubsub_udp.c
View File

0
plugins/ua_network_pubsub_udp.h → plugins/networking/ua_network_pubsub_udp.h
View File

0
plugins/ua_securitypolicies.h → plugins/securityPolicies/ua_securitypolicies.h
View File

0
plugins/ua_securitypolicy_basic128rsa15.c → plugins/securityPolicies/ua_securitypolicy_basic128rsa15.c
View File

0
plugins/ua_securitypolicy_basic256sha256.c → plugins/securityPolicies/ua_securitypolicy_basic256sha256.c
View File

0
plugins/ua_securitypolicy_none.c → plugins/securityPolicies/ua_securitypolicy_none.c
View File

6
tests/CMakeLists.txt
View File

@ -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)

6
tests/fuzz/CMakeLists.txt
View File

@ -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