rename /plugins/ua_config_standard.* to /plugins/ua_config_default.*

CMakeLists.txt

@@ -242,7 +242,7 @@ endif()
 
 include_directories(${PROJECT_BINARY_DIR}/src_generated
                     ${PROJECT_SOURCE_DIR}/include
-                    ${PROJECT_SOURCE_DIR}/plugins # TODO: discovery depends on the standard config
+                    ${PROJECT_SOURCE_DIR}/plugins # TODO: discovery depends on the default config
                     ${PROJECT_SOURCE_DIR}/deps)
 
 set(exported_headers ${PROJECT_BINARY_DIR}/src_generated/ua_config.h
@@ -262,7 +262,7 @@ set(exported_headers ${PROJECT_BINARY_DIR}/src_generated/ua_config.h
                      ${PROJECT_SOURCE_DIR}/plugins/ua_network_tcp.h
                      ${PROJECT_SOURCE_DIR}/plugins/ua_accesscontrol_default.h
                      ${PROJECT_SOURCE_DIR}/plugins/ua_log_stdout.h
-                     ${PROJECT_SOURCE_DIR}/plugins/ua_config_standard.h)
+                     ${PROJECT_SOURCE_DIR}/plugins/ua_config_default.h)
 
 set(internal_headers ${PROJECT_SOURCE_DIR}/deps/queue.h
                      ${PROJECT_SOURCE_DIR}/deps/pcg_basic.h
@@ -336,7 +336,7 @@ set(default_plugin_sources ${PROJECT_SOURCE_DIR}/plugins/ua_network_tcp.c
                            ${PROJECT_SOURCE_DIR}/plugins/ua_clock.c
                            ${PROJECT_SOURCE_DIR}/plugins/ua_log_stdout.c
                            ${PROJECT_SOURCE_DIR}/plugins/ua_accesscontrol_default.c
-                           ${PROJECT_SOURCE_DIR}/plugins/ua_config_standard.c)
+                           ${PROJECT_SOURCE_DIR}/plugins/ua_config_default.c)
 
 if(UA_DEBUG_DUMP_PKGS)
     list(APPEND lib_sources ${PROJECT_SOURCE_DIR}/plugins/ua_debug_dump_pkgs.c)
@@ -378,12 +378,13 @@ endif()
 # Generate source files #
 #########################
 
-if (UA_DATATYPES_FILE STREQUAL "")
-    set(SELECTED_TYPES_TMP "")
+if(UA_DATATYPES_FILE STREQUAL "")
+  set(SELECTED_TYPES_TMP "")
 else()
-    set(SELECTED_TYPES_TMP "--selected-types=${UA_DATATYPES_FILE}")
+  set(SELECTED_TYPES_TMP "--selected-types=${UA_DATATYPES_FILE}")
 endif()
 
+# standard-defined data types
 add_custom_command(OUTPUT ${PROJECT_BINARY_DIR}/src_generated/ua_types_generated.c
                           ${PROJECT_BINARY_DIR}/src_generated/ua_types_generated.h
                           ${PROJECT_BINARY_DIR}/src_generated/ua_types_generated_handling.h

examples/server_nodeset.c

@@ -2,11 +2,7 @@
  * See http://creativecommons.org/publicdomain/zero/1.0/ for more information. */
 
 #include <signal.h>
-#include <stdlib.h>
-#include "ua_server.h"
-#include "ua_log_stdout.h"
-#include "ua_config_standard.h"
-#include "ua_network_tcp.h"
+#include "open62541.h"
 
 /* Files nodeset.h and nodeset.c are created from server_nodeset.xml in the
  * /src_generated directory by CMake */

plugins/ua_config_standard.c

@@ -1,7 +1,7 @@
 /* This work is licensed under a Creative Commons CCZero 1.0 Universal License.
  * See http://creativecommons.org/publicdomain/zero/1.0/ for more information. */
 
-#include "ua_config_standard.h"
+#include "ua_config_default.h"
 #include "ua_log_stdout.h"
 #include "ua_network_tcp.h"
 #include "ua_accesscontrol_default.h"

plugins/ua_config_standard.h

@@ -1,8 +1,8 @@
 /* This work is licensed under a Creative Commons CCZero 1.0 Universal License.
  * See http://creativecommons.org/publicdomain/zero/1.0/ for more information. */
 
-#ifndef UA_CONFIG_STANDARD_H_
-#define UA_CONFIG_STANDARD_H_
+#ifndef UA_CONFIG_DEFAULT_H_
+#define UA_CONFIG_DEFAULT_H_
 
 #ifdef __cplusplus
 extern "C" {
@@ -36,7 +36,7 @@ UA_EXPORT UA_ServerConfig *
 UA_ServerConfig_new_minimal(UA_UInt16 portNumber,
                             const UA_ByteString *certificate);
 
-/* Creates a server config on the standard port 4840 with no server
+/* Creates a server config on the default port 4840 with no server
  * certificate. */
 static UA_INLINE UA_ServerConfig *
 UA_ServerConfig_new_default(void) {
@@ -57,4 +57,4 @@ extern const UA_EXPORT UA_ClientConfig UA_ClientConfig_default;
 }
 #endif
 
-#endif /* UA_CONFIG_STANDARD_H_ */
+#endif /* UA_CONFIG_DEFAULT_H_ */

plugins/ua_log_stdout.h

@@ -10,7 +10,7 @@
 extern "C" {
 #endif
 
-UA_EXPORT void
+void UA_EXPORT
 UA_Log_Stdout(UA_LogLevel level, UA_LogCategory category,
               const char *msg, va_list args);
 

src/server/ua_server_discovery.c

@@ -4,7 +4,7 @@
 
 #include "ua_server_internal.h"
 #include "ua_client.h"
-#include "ua_config_standard.h"
+#include "ua_config_default.h"
 
 #ifdef UA_ENABLE_DISCOVERY
 

tests/CMakeLists.txt

@@ -26,7 +26,7 @@ set(LIBS subunit ${CHECK_LIBRARIES} ${open62541_LIBRARIES})
 set(test_plugin_sources ${PROJECT_SOURCE_DIR}/plugins/ua_network_tcp.c
                         ${PROJECT_SOURCE_DIR}/tests/testing_clock.c
                         ${PROJECT_SOURCE_DIR}/plugins/ua_log_stdout.c
-                        ${PROJECT_SOURCE_DIR}/plugins/ua_config_standard.c
+                        ${PROJECT_SOURCE_DIR}/plugins/ua_config_default.c
                         ${PROJECT_SOURCE_DIR}/plugins/ua_accesscontrol_default.c
                         ${PROJECT_SOURCE_DIR}/tests/testing_clock.c)
 

tests/check_client.c

@@ -9,7 +9,7 @@
 #include "ua_types.h"
 #include "ua_server.h"
 #include "ua_client.h"
-#include "ua_config_standard.h"
+#include "ua_config_default.h"
 #include "ua_network_tcp.h"
 #include "check.h"
 

tests/check_client_async.c

@@ -9,7 +9,7 @@
 #include "ua_types.h"
 #include "ua_server.h"
 #include "ua_client.h"
-#include "ua_config_standard.h"
+#include "ua_config_default.h"
 #include "ua_network_tcp.h"
 #include "check.h"
 #include "testing_clock.h"

tests/check_client_highlevel.c

@@ -9,7 +9,7 @@
 
 #include "ua_server.h"
 #include "ua_client.h"
-#include "ua_config_standard.h"
+#include "ua_config_default.h"
 #include "ua_network_tcp.h"
 #include "check.h"
 

tests/check_client_subscriptions.c

@@ -10,7 +10,7 @@
 #include "ua_server.h"
 #include "ua_client.h"
 #include "ua_client_highlevel.h"
-#include "ua_config_standard.h"
+#include "ua_config_default.h"
 #include "ua_network_tcp.h"
 
 #include "check.h"

tests/check_discovery.c

@@ -26,7 +26,7 @@
 #include <fcntl.h>
 
 #include "ua_client.h"
-#include "ua_config_standard.h"
+#include "ua_config_default.h"
 #include "ua_network_tcp.h"
 #include "check.h"
 #include "testing_clock.h"

tests/check_server_binary_messages.c

@@ -8,7 +8,7 @@
 
 #include "ua_server.h"
 #include "ua_server_internal.h"
-#include "ua_config_standard.h"
+#include "ua_config_default.h"
 #include "ua_log_stdout.h"
 #include "testing_networklayers.h"
 

tests/check_server_jobs.c

@@ -4,7 +4,7 @@
 
 #include "ua_server.h"
 #include "server/ua_server_internal.h"
-#include "ua_config_standard.h"
+#include "ua_config_default.h"
 
 #include "check.h"
 #include "testing_clock.h"

tests/check_server_readspeed.c

@@ -8,7 +8,7 @@
 #include <stdio.h>
 
 #include "ua_server.h"
-#include "ua_config_standard.h"
+#include "ua_config_default.h"
 #include "server/ua_services.h"
 #include "ua_types_encoding_binary.h"
 

tests/check_server_userspace.c

@@ -6,7 +6,7 @@
 #include <stdlib.h>
 
 #include "ua_types.h"
-#include "ua_config_standard.h"
+#include "ua_config_default.h"
 #include "check.h"
 
 #ifdef __clang__

tests/check_services_attributes.c

@@ -11,7 +11,7 @@
 #include "server/ua_services.h"
 #include "ua_client.h"
 #include "ua_types.h"
-#include "ua_config_standard.h"
+#include "ua_config_default.h"
 #include "server/ua_server_internal.h"
 
 #ifdef __clang__

tests/check_services_nodemanagement.c

@@ -11,7 +11,7 @@
 #include "server/ua_services.h"
 #include "ua_client.h"
 #include "ua_types.h"
-#include "ua_config_standard.h"
+#include "ua_config_default.h"
 #include "server/ua_server_internal.h"
 
 #ifdef UA_ENABLE_MULTITHREADING

tests/check_services_subscriptions.c

@@ -6,7 +6,7 @@
 #include "server/ua_services.h"
 #include "server/ua_server_internal.h"
 #include "server/ua_subscription.h"
-#include "ua_config_standard.h"
+#include "ua_config_default.h"
 
 #include "check.h"
 #include "testing_clock.h"

tests/check_services_view.c

@@ -9,7 +9,7 @@
 
 #include "check.h"
 #include "ua_server.h"
-#include "ua_config_standard.h"
+#include "ua_config_default.h"
 #include "ua_network_tcp.h"
 
 UA_Server *server_translate_browse;

tests/fuzz/CMakeLists.txt

@@ -37,7 +37,7 @@ set(fuzzing_plugin_sources ${PROJECT_SOURCE_DIR}/plugins/ua_network_tcp.c
         ${PROJECT_SOURCE_DIR}/plugins/ua_clock.c
         ${PROJECT_SOURCE_DIR}/tests/testing_networklayers.c
         ${PROJECT_SOURCE_DIR}/plugins/ua_log_stdout.c
-        ${PROJECT_SOURCE_DIR}/plugins/ua_config_standard.c
+        ${PROJECT_SOURCE_DIR}/plugins/ua_config_default.c
         ${PROJECT_SOURCE_DIR}/plugins/ua_accesscontrol_default.c)
 
 add_library(open62541-fuzzplugins OBJECT ${fuzzing_plugin_sources})

tests/fuzz/fuzz_binary_decode.cc

@@ -4,7 +4,7 @@
 
 #include <ua_types.h>
 #include "ua_server_internal.h"
-#include "ua_config_standard.h"
+#include "ua_config_default.h"
 #include "ua_log_stdout.h"
 #include "ua_types_encoding_binary.h"
 

tests/fuzz/fuzz_binary_message.cc

@@ -3,7 +3,7 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 #include "ua_server_internal.h"
-#include "ua_config_standard.h"
+#include "ua_config_default.h"
 #include "ua_log_stdout.h"
 #include "ua_plugin_log.h"
 #include "testing_networklayers.h"

tests/testing_networklayers.c

@@ -4,7 +4,7 @@
 
 #include <stdlib.h>
 #include "testing_networklayers.h"
-#include "ua_config_standard.h"
+#include "ua_config_default.h"
 
 static UA_StatusCode
 dummyGetSendBuffer(UA_Connection *connection, size_t length, UA_ByteString *buf) {